Skip to content

Deleted compiled binary 'fixdep' fixes #1 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
prashants wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Deleted compiled binary 'fixdep' fixes #1 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3da3e52
Deleted compiled binary 'fixdep' fixes #1
prashants Nov 2, 2012
7428560
Fix compiler warnings due to incorrect format specifiers
prashants Nov 2, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions 3.4.6/netdisk/conn.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1784,7 +1784,7 @@ conn_text_target_data(uconn_t *conn, xbool is_set, TEXT_TARGET_DATA* data)

#ifdef DEBUG
if (is_set){
debug_conn(4, "Setting target data: 0x%llu", *data);
debug_conn(4, "Setting target data: 0x%lu", *data);
}
#endif

Expand All @@ -1811,7 +1811,7 @@ conn_text_target_data(uconn_t *conn, xbool is_set, TEXT_TARGET_DATA* data)
// Network endian to host endian.
*data = lsp_ntohll(*data);
#ifdef DEBUG
debug_conn(4, "Got target data: 0x%llu", *data);
debug_conn(4, "Got target data: 0x%lu", *data);
#endif
}
return ret;
Expand Down Expand Up @@ -2159,4 +2159,4 @@ conn_read_dib(uconn_t *conn,
sal_free(DevDIB_V2);
return err;
}
#endif /* NDAS_NO_LANSCSI */
#endif /* NDAS_NO_LANSCSI */
8 changes: 4 additions & 4 deletions 3.4.6/netdisk/lockmgmt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -961,7 +961,7 @@ GetBufferLockPendingRequestsWithHostInfo(
requestCount = ((xuint32)targetdata & TARGETDATA_REQUEST_COUNT_MASK);
if(RequestCounts)
*RequestCounts = requestCount;
debug_lock(2, "TargetData:0x%llu intentionCount:%u In-mem:%u",
debug_lock(2, "TargetData:0x%lu intentionCount:%u In-mem:%u",
targetdata,
requestCount,
BuffLockCtl->RequestCountWhenReleased);
Expand Down Expand Up @@ -1419,21 +1419,21 @@ NdasReleaseBufferLock(
release = TRUE;
} else if(Force) {
release = TRUE;
debug_lock(2, "Force option on. Acc=%llu Elap=%ld Diff=%ld",
debug_lock(2, "Force option on. Acc=%lu Elap=%ld Diff=%ld",
BuffLockCtl->AccumulatedIOBytes,
(xulong)(currentTime - (BuffLockCtl->AcquisitionExpireTime - BuffLockCtl->AcquisitionMaxTime)),
(xulong)(currentTime - BuffLockCtl->AcquisitionExpireTime)
);
} else if(BuffLockCtl->AcquisitionExpireTime <= currentTime) {
release = TRUE;
debug_lock(2, "Time over. Acc=%llu Elap=%ld Diff=%ld",
debug_lock(2, "Time over. Acc=%lu Elap=%ld Diff=%ld",
BuffLockCtl->AccumulatedIOBytes,
(xulong)(currentTime - (BuffLockCtl->AcquisitionExpireTime - BuffLockCtl->AcquisitionMaxTime)),
(xulong)(currentTime - BuffLockCtl->AcquisitionExpireTime)
);
} else if(BuffLockCtl->AccumulatedIOBytes >= BuffLockCtl->MaxIOBytes) {
release = TRUE;
debug_lock(2, "Bytes over. Acc=%llu Elap=%ld Diff=%ld",
debug_lock(2, "Bytes over. Acc=%lu Elap=%ld Diff=%ld",
BuffLockCtl->AccumulatedIOBytes,
(xulong)(currentTime - (BuffLockCtl->AcquisitionExpireTime - BuffLockCtl->AcquisitionMaxTime)),
(xulong)(currentTime - BuffLockCtl->AcquisitionExpireTime)
Expand Down
40 changes: 20 additions & 20 deletions 3.4.6/netdisk/udev.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3535,7 +3535,7 @@ Features register
}


debug_udev(1, "COM[0x%02x] NSEC[%d] LBA[0x%llx]", com, nsec, lba);
debug_udev(1, "COM[0x%02x] NSEC[%d] LBA[0x%lx]", com, nsec, lba);


if(nsec != (req->reqlen >> 9) ) {
Expand All @@ -3553,7 +3553,7 @@ Features register
}

if( (xuint64)(nsec + lba) >= sectorCount ) {
debug_udev(1, "BUG COM[0x%02x] NSEC[%d] LBA[0x%llx] totalcount[0x%llx]", com, nsec, lba, sectorCount);
debug_udev(1, "BUG COM[0x%02x] NSEC[%d] LBA[0x%lx] totalcount[0x%lx]", com, nsec, lba, sectorCount);
sal_memset(pc_req->sensedata, 0, DEFAULT_SENSE_DATA);
ndas_pc_io_set_sensedata(pc_req->sensedata,
SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ADSENSE_INVALID_CDB, 0);
Expand Down Expand Up @@ -3623,7 +3623,7 @@ Features register
}


debug_udev(1, "COM[0x%02x] NSEC[%d] LBA[0x%llx]", com, nsec, lba);
debug_udev(1, "COM[0x%02x] NSEC[%d] LBA[0x%lx]", com, nsec, lba);


if(nsec != (req->reqlen >> 9) ) {
Expand All @@ -3641,7 +3641,7 @@ Features register
}

if( (xuint64)(nsec + lba) >= sectorCount ) {
debug_udev(1, "BUG: COM[0x%02x] NSEC[%d] LBA[0x%llx] totalcount[0x%llx]", com, nsec, lba, sectorCount);
debug_udev(1, "BUG: COM[0x%02x] NSEC[%d] LBA[0x%lx] totalcount[0x%lx]", com, nsec, lba, sectorCount);
sal_memset(pc_req->sensedata, 0, DEFAULT_SENSE_DATA);
ndas_pc_io_set_sensedata(pc_req->sensedata,
SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ADSENSE_INVALID_CDB, 0);
Expand Down Expand Up @@ -3722,7 +3722,7 @@ Features register
}


debug_udev(1, "COM[0x%02x] NSEC[%u] LBA[0x%llx]", com, nsec, lba);
debug_udev(1, "COM[0x%02x] NSEC[%u] LBA[0x%lx]", com, nsec, lba);


if(nsec != (req->reqlen >> 9) ) {
Expand All @@ -3739,7 +3739,7 @@ Features register
}

if( (xuint64)(nsec + lba) >= sectorCount ) {
debug_udev(1, "BUG: COM[0x%02x] NSEC[%d] LBA[0x%llx] totalcount[0x%llx]", com, nsec, lba, sectorCount);
debug_udev(1, "BUG: COM[0x%02x] NSEC[%d] LBA[0x%lx] totalcount[0x%lx]", com, nsec, lba, sectorCount);
sal_memset(pc_req->sensedata, 0, DEFAULT_SENSE_DATA);
ndas_pc_io_set_sensedata(pc_req->sensedata,
SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ADSENSE_INVALID_CDB, 0);
Expand Down Expand Up @@ -3846,7 +3846,7 @@ Features register
}


debug_udev(1, "COM[0x%02x] NSEC[%d] LBA[0x%llx]", com, nsec, lba);
debug_udev(1, "COM[0x%02x] NSEC[%d] LBA[0x%lx]", com, nsec, lba);


if(nsec != (req->reqlen >> 9) ) {
Expand All @@ -3863,7 +3863,7 @@ Features register
}

if( (xuint64)(nsec + lba) >= sectorCount ) {
debug_udev(1, "BUG: COM[0x%02x] NSEC[%d] LBA[0x%llx] totalcount[0x%llx]", com, nsec, lba, sectorCount);
debug_udev(1, "BUG: COM[0x%02x] NSEC[%d] LBA[0x%lx] totalcount[0x%lx]", com, nsec, lba, sectorCount);
sal_memset(pc_req->sensedata, 0, DEFAULT_SENSE_DATA);
ndas_pc_io_set_sensedata(pc_req->sensedata,
SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ADSENSE_INVALID_CDB, 0);
Expand Down Expand Up @@ -3906,10 +3906,10 @@ Features register
}


debug_udev(1, "COM[0x%02x] NSEC[%d] LBA[0x%llx]", com, nsec, lba);
debug_udev(1, "COM[0x%02x] NSEC[%d] LBA[0x%lx]", com, nsec, lba);

if( (xuint64)(nsec + lba) >= sectorCount ) {
debug_udev(1, "BUG COM[0x%02x] NSEC[%d] LBA[0x%llx] totalcount[0x%llx]", com, nsec, lba, sectorCount);
debug_udev(1, "BUG COM[0x%02x] NSEC[%d] LBA[0x%lx] totalcount[0x%lx]", com, nsec, lba, sectorCount);
sal_memset(pc_req->sensedata, 0, DEFAULT_SENSE_DATA);
ndas_pc_io_set_sensedata(pc_req->sensedata,
SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ADSENSE_INVALID_CDB, 0);
Expand Down Expand Up @@ -3968,11 +3968,11 @@ Features register
}


debug_udev(1, "COM[0x%02x] NSEC[%d] LBA[0x%llx]", com, nsec, lba);
debug_udev(1, "COM[0x%02x] NSEC[%d] LBA[0x%lx]", com, nsec, lba);


if( (xuint64)(nsec + lba) >= sectorCount ) {
debug_udev(1, "BUG: COM[0x%02x] NSEC[%d] LBA[0x%llx] totalcount[0x%llx]", com, nsec, lba, sectorCount);
debug_udev(1, "BUG: COM[0x%02x] NSEC[%d] LBA[0x%lx] totalcount[0x%lx]", com, nsec, lba, sectorCount);
sal_memset(pc_req->sensedata, 0, DEFAULT_SENSE_DATA);
ndas_pc_io_set_sensedata(pc_req->sensedata,
SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ADSENSE_INVALID_CDB, 0);
Expand Down Expand Up @@ -4214,8 +4214,8 @@ ndas_error_t ndas_io_ata_process(logunit_t * l_udev, ndas_io_request * req)

REVERSE_BYTES_64(&readCapacityDataEx.LogicalBlockAddress, &logicalBlockAddress);

debug_udev(1, "SCSIOP_READ_CAPACITYEX blockaddress ORGINAL 0x%llx", logicalBlockAddress);
debug_udev(1, "SCSIOP_READ_CAPACITYEX blockaddress 0x%llx", readCapacityDataEx.LogicalBlockAddress);
debug_udev(1, "SCSIOP_READ_CAPACITYEX blockaddress ORGINAL 0x%lx", logicalBlockAddress);
debug_udev(1, "SCSIOP_READ_CAPACITYEX blockaddress 0x%lx", readCapacityDataEx.LogicalBlockAddress);


blockSize = s_info->sector_size;
Expand Down Expand Up @@ -4678,7 +4678,7 @@ ndas_error_t ndas_io_ata_process(logunit_t * l_udev, ndas_io_request * req)
+ ((xuint64)pc_req->cmd[2] << 8)
+ (((xuint64)pc_req->cmd[1] & 0x1f) << 16));
transferblocks = pc_req->cmd[4];
debug_udev(3, "CALL READ6 total sector %lldlogicalBlockAddress %lld tansferbloks %d buflen %d",
debug_udev(3, "CALL READ6 total sector %lu logicalBlockAddress %lu tansferbloks %d buflen %d",
total_sector, logicalBlockAddress, transferblocks, req->reqlen);

}else if (pc_req->cmd[0] == SCSIOP_READ) {
Expand All @@ -4692,7 +4692,7 @@ ndas_error_t ndas_io_ata_process(logunit_t * l_udev, ndas_io_request * req)
transferblocks =(xuint32) ((xuint32)cdb->CDB10.TransferBlocksLsb
+ ((xuint32)cdb->CDB10.TransferBlocksMsb << 8));

debug_udev(3, "CALL READ total sector %lldlogicalBlockAddress %lld tansferbloks %d buflen %d",
debug_udev(3, "CALL READ total sector %lu logicalBlockAddress %lu tansferbloks %d buflen %d",
total_sector, logicalBlockAddress, transferblocks, req->reqlen);

}else if (pc_req->cmd[0] == SCSIOP_READ12){
Expand All @@ -4705,7 +4705,7 @@ ndas_error_t ndas_io_ata_process(logunit_t * l_udev, ndas_io_request * req)
+ ((xuint32)cdb->READ12.TransferLength[2] << 8)
+ ((xuint32)cdb->READ12.TransferLength[1] << 16)
+ ((xuint32)cdb->READ12.TransferLength[0] << 24));
debug_udev(3, "CALL READ12 total sector %lldlogicalBlockAddress %lld tansferbloks %d buflen %d",
debug_udev(3, "CALL READ12 total sector %lu logicalBlockAddress %lu tansferbloks %d buflen %d",
total_sector, logicalBlockAddress, transferblocks, req->reqlen);
}else if (pc_req->cmd[0] == SCSIOP_READ16) {
logicalBlockAddress = (xuint64)((xuint64)cdb->READ16.LogicalBlock[7]
Expand All @@ -4721,7 +4721,7 @@ ndas_error_t ndas_io_ata_process(logunit_t * l_udev, ndas_io_request * req)
+ ((xuint32)cdb->READ16.TransferLength[2] << 8)
+ ((xuint32)cdb->READ16.TransferLength[1] << 16)
+ ((xuint32)cdb->READ16.TransferLength[0] << 24));
debug_udev(3, "CALL READ12 total sector %lld logicalBlockAddress %lld tansferbloks %d buflen %d",
debug_udev(3, "CALL READ12 total sector %lu logicalBlockAddress %lu tansferbloks %d buflen %d",
total_sector, logicalBlockAddress, transferblocks, req->reqlen);
}

Expand Down Expand Up @@ -5278,14 +5278,14 @@ ndas_error_t ndas_io(int slot, xint8 cmd, ndas_io_request* req, xbool bound_chec
total_sector = log_udev->info.sectors;
reqed_sector = req->start_sec;
if (reqed_sector >= total_sector || reqed_sector + req->num_sec > total_sector) {
debug_udev(1, "reqed_sector=%llu total_sector=%llu req->num_sec=%u",
debug_udev(1, "reqed_sector=%lu total_sector=%lu req->num_sec=%u",
reqed_sector, total_sector, req->num_sec);
sal_assert(reqed_sector + req->num_sec <= total_sector);
return NDAS_ERROR_INVALID_RANGE_REQUEST;
}
}

debug_udev(8, "ing start sector %llu, count %d", req->start_sec, req->num_sec);
debug_udev(8, "ing start sector %lu, count %d", req->start_sec, req->num_sec);
debug_udev(8, "req->done_arg=%p", req->done_arg);

tir = tir_alloc(cmd, req);
Expand Down
Binary file removed 3.4.6/scripts/basic/fixdep
View file
Open in desktop
Binary file not shown.