svn commit: samba r10259 - in trunk/source: torture utils

[vlendec]

Author: vlendec
Date: 2005-09-16 08:02:20 +0000 (Fri, 16 Sep 2005)
New Revision: 10259

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10259

Log:
Fix some warnings
Modified:
   trunk/source/torture/mangle_test.c
   trunk/source/torture/torture.c
   trunk/source/torture/vfstest.c
   trunk/source/utils/log2pcaphex.c


Changeset:
Modified: trunk/source/torture/mangle_test.c
===================================================================
--- trunk/source/torture/mangle_test.c  2005-09-16 07:24:36 UTC (rev 10258)
+++ trunk/source/torture/mangle_test.c  2005-09-16 08:02:20 UTC (rev 10259)
@@ -98,7 +98,7 @@
        } else {
                TDB_DATA namedata;
                /* store it for later */
-               namedata.dptr = name;
+               namedata.dptr = CONST_DISCARD(char *, name);
                namedata.dsize = strlen(name)+1;
                tdb_store_bystring(tdb, shortname, namedata, TDB_REPLACE);
        }

Modified: trunk/source/torture/torture.c
===================================================================
--- trunk/source/torture/torture.c      2005-09-16 07:24:36 UTC (rev 10258)
+++ trunk/source/torture/torture.c      2005-09-16 08:02:20 UTC (rev 10259)
@@ -698,7 +698,6 @@
 {
        struct cli_state *cli;
        int i;
-       fstring fname;
        pstring line;
        char cname[20];
        FILE *f;

Modified: trunk/source/torture/vfstest.c
===================================================================
--- trunk/source/torture/vfstest.c      2005-09-16 07:24:36 UTC (rev 10258)
+++ trunk/source/torture/vfstest.c      2005-09-16 08:02:20 UTC (rev 10259)
@@ -38,7 +38,7 @@
 /****************************************************************************
 handle completion of commands for readline
 ****************************************************************************/
-static char **completion_fn(char *text, int start, int end)
+static char **completion_fn(const char *text, int start, int end)
 {
 #define MAX_COMPLETIONS 100
        char **matches;

Modified: trunk/source/utils/log2pcaphex.c
===================================================================
--- trunk/source/utils/log2pcaphex.c    2005-09-16 07:24:36 UTC (rev 10258)
+++ trunk/source/utils/log2pcaphex.c    2005-09-16 08:02:20 UTC (rev 10259)
@@ -200,7 +200,7 @@
 long read_log_data(FILE *in, unsigned char *buffer, long data_length)
 {
        long i, addr; char real[2][16]; int ret;
-       unsigned char tmp;
+       unsigned int tmp;
        for(i = 0; i < data_length; i++) {
                if(i % 16 == 0){
                        if(i != 0) { /* Read data after each line */
@@ -213,7 +213,7 @@
                        }
                        assert(addr == i);
                }
-               if(!fscanf(in, "%02lX", &tmp)) {
+               if(!fscanf(in, "%02X", &tmp)) {
                        if(!quiet)fprintf(stderr, "Only first %ld bytes are 
logged, packet trace will be incomplete\nTry a higher log level\n", i-1);
                        return i-1;
                }
@@ -230,7 +230,7 @@
        poptContext pc;
        char buffer[4096];
        long data_offset, data_length;
-       long data_bytes_read;
+       long data_bytes_read = 0;
        int in_packet = 0;
        struct poptOption long_options[] = {
                POPT_AUTOHELP