admin/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

change u_int to uint

Browse Source
This commit is contained in:
Ronnie Sahlberg
2012-11-29 19:14:26 -08:00
parent 7704215bcc
commit b1da7311c4
4 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/iscsi-private.h
View File

@@ -324,7 +324,7 @@ void
iscsi_add_to_outqueue(struct iscsi_context *iscsi, struct iscsi_pdu *pdu);
int
iscsi_serial32_compare(u_int32_t s1, u_int32_t s2);
iscsi_serial32_compare(uint32_t s1, uint32_t s2);
u_int32_t
iscsi_itt_post_increment(struct iscsi_context *iscsi);

2
lib/init.c
View File

@@ -89,7 +89,7 @@ iscsi_create_context(const char *initiator_name)
iscsi->fd = -1;
srand(time(NULL) ^ getpid() ^ (u_int32_t) ((uintptr_t) iscsi));
srand(time(NULL) ^ getpid() ^ (uint32_t) ((uintptr_t) iscsi));
/* initialize to a "random" isid */
iscsi_set_isid_random(iscsi, rand(), 0);

14
lib/pdu.c
View File

@@ -38,19 +38,19 @@
* not happen in iSCSI protocol.
*/
int
iscsi_serial32_compare(u_int32_t s1, u_int32_t s2) {
iscsi_serial32_compare(uint32_t s1, uint32_t s2) {
if (s1 == s2) return 0;
if (s1 < s2 && s2-s1 < (u_int32_t)1<<31) return -1;
if (s1 > s2 && s1-s2 < (u_int32_t)1<<31) return 1;
if (s1 > s2 && s1-s2 > (u_int32_t)1<<31) return -1;
if (s1 < s2 && s2-s1 > (u_int32_t)1<<31) return 1;
if (s1 < s2 && s2-s1 < (uint32_t)1<<31) return -1;
if (s1 > s2 && s1-s2 < (uint32_t)1<<31) return 1;
if (s1 > s2 && s1-s2 > (uint32_t)1<<31) return -1;
if (s1 < s2 && s2-s1 > (uint32_t)1<<31) return 1;
/* undefined result */
return -1;
}
u_int32_t
uint32_t
iscsi_itt_post_increment(struct iscsi_context *iscsi) {
u_int32_t old_itt = iscsi->itt;
uint32_t old_itt = iscsi->itt;
iscsi->itt++;
/* 0xffffffff is a reserved value */
if (iscsi->itt == 0xffffffff) {

7
src/ld_iscsi.c
View File

@@ -335,6 +335,10 @@ ssize_t read(int fd, void *buf, size_t count)
iscsi_fd_list[fd].in_flight = 1;
if (iscsi_fd_list[fd].get_lba_status != 0) {
uint32_t i;
uint32_t _num_allocated=0;
uint32_t _num_blocks=0;
if (iscsi_fd_list[fd].lbasd_cache_valid==1) {
LD_ISCSI_DPRINTF(5,"cached get_lba_status_descriptor is lba %lu, num_blocks %d, provisioning %d",iscsi_fd_list[fd].lbasd_cached.lba,iscsi_fd_list[fd].lbasd_cached.num_blocks,iscsi_fd_list[fd].lbasd_cached.provisioning);
if (iscsi_fd_list[fd].lbasd_cached.provisioning != 0x00 && lba >= iscsi_fd_list[fd].lbasd_cached.lba && lba+num_blocks < iscsi_fd_list[fd].lbasd_cached.lba+iscsi_fd_list[fd].lbasd_cached.num_blocks)
@@ -363,10 +367,7 @@ ssize_t read(int fd, void *buf, size_t count)
return -1;
}
u_int32_t i;
LD_ISCSI_DPRINTF(5,"get_lba_status: num_descriptors: %d",lbas->num_descriptors);
u_int32_t _num_allocated=0;
u_int32_t _num_blocks=0;
for (i=0;i<lbas->num_descriptors;i++) {
struct scsi_lba_status_descriptor *lbasd = &lbas->descriptors[i];
LD_ISCSI_DPRINTF(5,"get_lba_status_descriptor %d, lba %lu, num_blocks %d, provisioning %d",i,lbasd->lba,lbasd->num_blocks,lbasd->provisioning);