Fix some warnings due to uint16_t!=-1 always being true

diff --git a/source3/client/clitar.c b/source3/client/clitar.c
index c7f2819c88a42ae2c8e3058364ecf9b67a345c5b..fd6c4ccef9a5edbdfbeef59874a1a2ffb2da888d 100644 (file)
--- a/source3/client/clitar.c
+++ b/source3/client/clitar.c
@@ -789,7 +789,7 @@ static void do_atar(const char *rname_in,char *lname,file_info *finfo1)
 
   cleanup:
 
-       if (fnum != -1) {
+       if (fnum != (uint16_t)-1) {
                cli_close(cli, fnum);
                fnum = -1;
        }

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 1f8ef7ecfb7d9dd75436dca5c3a9f72d0a696d75..be2a854aaf1f0d36afcb80a96bcb8a840eb5ae4d 100644 (file)
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -553,7 +553,7 @@ static bool rw_torture3(struct cli_state *c, char *lockfname)
        }
        else
        {
-               for (i = 0; i < 500 && fnum == -1; i++)
+               for (i = 0; i < 500 && fnum == (uint16_t)-1; i++)
                {
                        status = cli_open(c, lockfname, O_RDONLY, 
                                         DENY_NONE, &fnum);
@@ -3380,8 +3380,8 @@ static bool run_deletetest(int dummy)
         * intialized, because these functions don't handle
         * uninitialized connections. */
 
-       if (fnum1 != -1) cli_close(cli1, fnum1);
-       if (fnum2 != -1) cli_close(cli1, fnum2);
+       if (fnum1 != (uint16_t)-1) cli_close(cli1, fnum1);
+       if (fnum2 != (uint16_t)-1) cli_close(cli1, fnum2);
        cli_setatr(cli1, fname, 0, 0);
        cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
 
@@ -3835,7 +3835,7 @@ static bool run_opentest(int dummy)
 
        printf("testing ctemp\n");
        fnum1 = cli_ctemp(cli1, "\\", &tmp_path);
-       if (fnum1 == -1) {
+       if (fnum1 == (uint16_t)-1) {
                printf("ctemp failed (%s)\n", cli_errstr(cli1));
                return False;
        }

diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index 8689a09e20af243a3f5b3ca01179db5ab4d58b20..9f4470b60d2454bcda632178f9f772c75be5e2e7 100644 (file)
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -4319,7 +4319,7 @@ static void show_userlist(struct rpc_pipe_client *pipe_hnd,
                d_printf(" %s\n", tokens[i].name);
        }
 
-       if (fnum != -1)
+       if (fnum != (uint16_t)-1)
                cli_close(cli, fnum);
        cli_tdis(cli);
        cli->cnum = cnum;