From: Ronnie Sahlberg Date: Mon, 2 Jul 2007 06:13:31 +0000 (+1000) Subject: get rid of some compiler warnings for the scsi tool X-Git-Tag: tevent-0.9.20~348^2~2480^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=27ce064abd3fc7729fd7160e33f6bd7fef280305;p=thirdparty%2Fsamba.git get rid of some compiler warnings for the scsi tool (This used to be ctdb commit 391657fe19f4359b1376a9aedb661271dfe0c542) --- diff --git a/ctdb/Makefile.in b/ctdb/Makefile.in index 9b549b126e4..8641c12fc4a 100644 --- a/ctdb/Makefile.in +++ b/ctdb/Makefile.in @@ -53,7 +53,7 @@ CTDB_SERVER_OBJ = server/ctdbd.o server/ctdb_daemon.o server/ctdb_lockwait.o \ $(CTDB_TAKEOVER_OBJ) $(CTDB_TCP_OBJ) @INFINIBAND_WRAPPER_OBJ@ TEST_BINS=bin/ctdb_bench bin/ctdb_fetch bin/ctdb_store @INFINIBAND_BINS@ -BINS = bin/ctdb +BINS = bin/ctdb bin/scsi_io SBINS = bin/ctdbd DIRS = lib bin @@ -79,6 +79,10 @@ bin/ctdbd: $(CTDB_SERVER_OBJ) @echo Linking $@ @$(CC) $(CFLAGS) -o $@ $(CTDB_SERVER_OBJ) $(LIB_FLAGS) +bin/scsi_io: $(CLIENT_OBJS) scsi/scsi_io.o + @echo Linking $@ + @$(CC) $(CFLAGS) -o $@ scsi/scsi_io.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS) + bin/ctdb: $(CLIENT_OBJS) tools/ctdb.o @echo Linking $@ @$(CC) $(CFLAGS) -o $@ tools/ctdb.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS) diff --git a/ctdb/scsi/scsi_io.c b/ctdb/scsi/scsi_io.c index 079aa6f7d4a..0d5013dc1e1 100644 --- a/ctdb/scsi/scsi_io.c +++ b/ctdb/scsi/scsi_io.c @@ -31,7 +31,7 @@ #define SCSI_TIMEOUT 5000 /* ms */ -char *sensetable[16]={ +const char *sensetable[16]={ "no sense", "recovered error", "not ready", @@ -50,7 +50,7 @@ char *sensetable[16]={ "unknown" }; -int scsi_io(int fd, unsigned char *cdb, unsigned char cdb_size, int xfer_dir, unsigned char *data, unsigned int *data_size, char *sense, unsigned int *sense_len) +int scsi_io(int fd, unsigned char *cdb, unsigned char cdb_size, int xfer_dir, unsigned char *data, unsigned int *data_size, unsigned char *sense, unsigned int *sense_len) { sg_io_hdr_t io_hdr; @@ -130,7 +130,7 @@ void usage(void) typedef struct _value_string_t { int value; - char *string; + const char *string; } value_string_t; @@ -158,7 +158,7 @@ value_string_t vpd_pages[] = { {0,NULL} }; -char *val_to_str(value_string_t *vs, int v) +const char *val_to_str(value_string_t *vs, int v) { while(vs && vs->string){ if(vs->value==v){ @@ -207,7 +207,7 @@ void print_sense_data(unsigned char *sense, int sense_len) int scsi_inquiry(int fd) { - char cdb[]={0x12,0,0,0,0,0}; + unsigned char cdb[]={0x12,0,0,0,0,0}; unsigned int data_size=96; unsigned char data[data_size]; @@ -310,7 +310,7 @@ int scsi_inquiry(int fd) int scsi_inquiry_supported_vpd_pages(int fd) { - char cdb[]={0x12,0x01,0,0,0,0}; + unsigned char cdb[]={0x12,0x01,0,0,0,0}; unsigned int data_size=0xff; unsigned char data[data_size]; @@ -351,7 +351,7 @@ int scsi_inquiry_supported_vpd_pages(int fd) int scsi_inquiry_unit_serial_number(int fd) { - char cdb[]={0x12,0x01,0x80,0,0,0}; + unsigned char cdb[]={0x12,0x01,0x80,0,0,0}; unsigned int data_size=0x00ff; unsigned char data[data_size]; @@ -389,7 +389,7 @@ int scsi_inquiry_unit_serial_number(int fd) int scsi_persistent_reserve_in_read_keys(int fd) { - char cdb[]={0x5e,0,0,0,0,0,0,0,0,0}; + unsigned char cdb[]={0x5e,0,0,0,0,0,0,0,0,0}; unsigned int data_size=0x00ff; unsigned char data[data_size]; @@ -422,14 +422,14 @@ int scsi_persistent_reserve_in_read_keys(int fd) prgeneration<<=8;prgeneration|=data[1]; prgeneration<<=8;prgeneration|=data[2]; prgeneration<<=8;prgeneration|=data[3]; - printf("PRGeneration:%d\n", prgeneration); + printf("PRGeneration:%lu\n", prgeneration); /* Additional Length */ additional_length=data[4]; additional_length<<=8;additional_length|=data[5]; additional_length<<=8;additional_length|=data[6]; additional_length<<=8;additional_length|=data[7]; - printf("Additional Length:%d\n", additional_length); + printf("Additional Length:%lu\n", additional_length); /* print the registered keys */ for(i=0;i