Squash more viced warnings

Get rid of more warnings in viced
  - Cast fids that we pass into the Dir package to avoid type warnings
  - Add ()s to a && b || c, to clarify its meaning - (a && b ) || c
  - Don't use %ld to print ints
  - Prototype another function from the host package

Reviewed-on: http://gerrit.openafs.org/539
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/viced/afsfileprocs.c b/src/viced/afsfileprocs.c
index e6f8f7f9b212b9f3ad8fab8b1f61b3aab6ca42bc..31bdc85bbf67b3f25db40446ec85edef87491890 100644 (file)
--- a/src/viced/afsfileprocs.c
+++ b/src/viced/afsfileprocs.c
@@ -1348,7 +1348,7 @@ DeleteTarget(Vnode * parentptr, Volume * volptr, Vnode ** targetptr,
        SetDirHandle(&childdir, *targetptr);
        if (IsEmpty(&childdir) != 0)
            return (EEXIST);
-       DZap(&childdir);
+       DZap((afs_int32 *) &childdir);
        FidZap(&childdir);
        (*targetptr)->delete = 1;
     } else if ((--(*targetptr)->disk.linkCount) == 0)
@@ -4810,7 +4810,7 @@ SAFSS_MakeDir(struct rx_call *acall, struct AFSFid *DirFid, char *Name,
 
     /* Actually create the New directory in the directory package */
     SetDirHandle(&dir, targetptr);
-    assert(!(MakeDir(&dir, OutFid, DirFid)));
+    assert(!(MakeDir(&dir, (afs_int32 *)OutFid, (afs_int32 *)DirFid)));
     DFlush();
     VN_SET_LEN(targetptr, (afs_fsize_t) Length(&dir));
 
@@ -7716,7 +7716,7 @@ sys_error_to_et(afs_int32 in)
        return 0;
     if (in < 0 || in > 511)
        return in;
-    if (in >= VICE_SPECIAL_ERRORS && in <= VIO || in == VRESTRICTED)
+    if ((in >= VICE_SPECIAL_ERRORS && in <= VIO) || in == VRESTRICTED)
        return in;
     if (sys2et[in] != 0)
        return sys2et[in];

diff --git a/src/viced/host.c b/src/viced/host.c
index a0dc675d84bcff8f2b2354ae30a85120ae66c871..e6445fe7a5dfa782a9dc3055956021226d094da9 100644 (file)
--- a/src/viced/host.c
+++ b/src/viced/host.c
@@ -2710,7 +2710,7 @@ h_DumpHost(register struct host *host, int held, void *rock)
        sprintf(tmpStr, "%04x", host->holds[i]);
        (void)STREAM_WRITE(tmpStr, strlen(tmpStr), 1, file);
     }
-    sprintf(tmpStr, " slot/bit: %ld/%d\n", h_holdSlot(), h_holdbit());
+    sprintf(tmpStr, " slot/bit: %d/%d\n", h_holdSlot(), h_holdbit());
     (void)STREAM_WRITE(tmpStr, strlen(tmpStr), 1, file);
 
     H_UNLOCK;

diff --git a/src/viced/host.h b/src/viced/host.h
index c3bacf3a56c598c499f5b26531160de896b6ca30..5f9aa6fcd77e5d9b3c24ae5e67e07eea3f3b6239 100644 (file)
--- a/src/viced/host.h
+++ b/src/viced/host.h
@@ -255,6 +255,7 @@ extern int initInterfaceAddr_r(struct host *host, struct interfaceAddr *interf);
 extern void h_AddHostToAddrHashTable_r(afs_uint32 addr, afs_uint16 port, struct host * host);
 extern void h_AddHostToUuidHashTable_r(afsUUID * uuid, struct host * host);
 extern int h_DeleteHostFromAddrHashTable_r(afs_uint32 addr, afs_uint16 port, struct host *host);
+extern int h_DeleteHostFromUuidHashTable_r(struct host *host);
 extern int initInterfaceAddr_r(struct host *host, struct interfaceAddr *interf);
 extern int addInterfaceAddr_r(struct host *host, afs_uint32 addr, afs_uint16 port);
 extern int removeInterfaceAddr_r(struct host *host, afs_uint32 addr, afs_uint16 port);