STABLE14-linux-and-64bit-cleanup-20050710

FIXES 19166

fix warnings found on x86_64 linux

(cherry picked from commit 685989647d0fb31eca60e0900cea1598d5c001d8)

diff --git a/Makefile.in b/Makefile.in
index 09424b8f6ca99282643cd91124bb615bc7ad33ce..428d8f47220aaa19f337c75065f38c6eb15bbaa7 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -387,6 +387,9 @@ kauth_depinstall: pinstall rxgen comerr
 ptserver_depinstall: pinstall rxgen comerr
        ${COMPILE_PART1} ptserver ${COMPILE_DEPINSTALL}
 
+${DEST}/bin/dedebug: dedebug
+       ${INSTALL} -s $? $@
+
 
 #
 # libafs build targets

diff --git a/src/bozo/bnode.c b/src/bozo/bnode.c
index 038db5d343d1f42a434520ac77ee29d000d2e4e5..a4ba07e48193fb127949afd5b22f0dcc5311b36c 100644 (file)
--- a/src/bozo/bnode.c
+++ b/src/bozo/bnode.c
@@ -713,7 +713,7 @@ SendNotifierData(register int fd, register struct bnode_proc *tp)
     bufp += strlen(bufp);
     (void)sprintf(bufp, "END bnode\n");
     bufp += strlen(bufp);
-    len = (int)bufp - (int)buffer;
+    len = (int)(bufp - buffer);
     if (write(fd, buffer, len) < 0) {
        return -1;
     }

diff --git a/src/bucoord/commands.c b/src/bucoord/commands.c
index a78fc2ebaac7d017e8603b19de06e3dbc452ef71..a1d6b00cf700ef4d02ff04c03b1aab4b1fbffcd1 100644 (file)
--- a/src/bucoord/commands.c
+++ b/src/bucoord/commands.c
@@ -14,7 +14,13 @@ RCSID
     ("$Header$");
 
 #include <afs/stds.h>
+#if defined(AFS_LINUX24_ENV)
+#define _REGEX_RE_COMP
+#endif
 #include <sys/types.h>
+#if defined(AFS_LINUX24_ENV)
+#include <regex.h>
+#endif
 #include <afs/cmd.h>
 #ifdef AFS_NT40_ENV
 #include <winsock2.h>

diff --git a/src/budb/db_text.c b/src/budb/db_text.c
index be3ad812a826deb5c39259fb25cda1a69170445c..0627cc7b3a00b880604e87cd1683fe785ec73e53 100644 (file)
--- a/src/budb/db_text.c
+++ b/src/budb/db_text.c
@@ -441,7 +441,7 @@ SaveText(call, lockHandle, textType, offset, flags, charListPtr)
 
            /* now have to update the previous block's link */
            linkOffset =
-               (afs_int32) & diskBlock.h.next - (afs_int32) & diskBlock;
+               (afs_int32) ((char*)& diskBlock.h.next - (char*)& diskBlock);
            linkValue = htonl(diskBlockAddr);
 
            code =

diff --git a/src/butc/lwps.c b/src/butc/lwps.c
index 534ab48b46b1f125a4fa29efb8529b8eb521070b..798f981d1ccf26dfeee5c9c797b2a63c5db7be89 100644 (file)
--- a/src/butc/lwps.c
+++ b/src/butc/lwps.c
@@ -2418,7 +2418,7 @@ readVolumeHeader(buffer, bufloc, header)
 
 {
     struct volumeHeader vhptr, *tempvhptr;
-    afs_int32 firstSplice = (afs_int32) & vhptr.pad - (afs_int32) & vhptr;
+    afs_int32 firstSplice = (afs_int32) ((char*)& vhptr.pad - (char*) & vhptr);
     int padLen = sizeof(vhptr.pad);    /* pad to achieve 4 byte alignment */
     int nextSplice = sizeof(struct volumeHeader) - firstSplice - padLen;
 

diff --git a/src/butc/recoverDb.c b/src/butc/recoverDb.c
index e54a05521227708deb8ccaa248280ea3548b00f9..778ef281b36b585b294b6209a8fa2d23378c0b59 100644 (file)
--- a/src/butc/recoverDb.c
+++ b/src/butc/recoverDb.c
@@ -909,7 +909,7 @@ databaseTape(tapeName)
     if (!sptr)
        return (0);
 
-    c = (int)((afs_int32) sptr - (afs_int32) tapeName);
+    c = (int)((char *) sptr - (char *) tapeName);
     if (strncmp(tapeName, DUMP_TAPE_NAME, c) == 0)
        return (1);
 

diff --git a/src/gtx/gtxtest.c b/src/gtx/gtxtest.c
index 6d99d480d3f37134d8e5fc54456f327d53e5d7b5..68877ac70390893d36565cad57eb096bd9b3cb91 100644 (file)
--- a/src/gtx/gtxtest.c
+++ b/src/gtx/gtxtest.c
@@ -26,6 +26,7 @@ RCSID
 #include "gtxobjects.h"
 #include "gtxtextobj.h"
 #include "gtxlightobj.h"
+#include "gtxkeymap.h"
 #include "gtxframe.h"
 
 struct gtx_frame *frameA, *frameB;

diff --git a/src/kauth/client.c b/src/kauth/client.c
index 64f8f4e60065e230927fc735d7ee0285dc5114c1..6c0a180aac8fe2adc1ee79a1b03b297279121c8b 100644 (file)
--- a/src/kauth/client.c
+++ b/src/kauth/client.c
@@ -18,6 +18,9 @@ RCSID
     ("$Header$");
 
 #if defined(UKERNEL)
+#ifdef HAVE_UNISTD_H
+#define __USE_XOPEN
+#endif
 #include "afs/sysincludes.h"
 #include "afsincludes.h"
 #include "afs/stds.h"

diff --git a/src/util/serverLog.c b/src/util/serverLog.c
index 92eccd9863acb590095d018019bb8d21fd5d6c9e..b6b4889878be7c5cf85cb96d741cde22146c3474 100644 (file)
--- a/src/util/serverLog.c
+++ b/src/util/serverLog.c
@@ -228,7 +228,7 @@ ResetDebug_Signal(int signo)
 #if defined(AFS_PTHREAD_ENV)
     DebugOn(LogLevel);
 #else /* AFS_PTHREAD_ENV */
-    IOMGR_SoftSig(DebugOn, (void *)LogLevel);
+    IOMGR_SoftSig(DebugOn, LogLevel);
 #endif /* AFS_PTHREAD_ENV */
 
     (void)signal(signo, ResetDebug_Signal);    /* on some platforms,

diff --git a/src/venus/fstrace.c b/src/venus/fstrace.c
index 8d0b5846353314a132bf89b420c2a12e580c457a..27899cc8dd2df00d5aef21ea0d1c7559c4fb88e3 100644 (file)
--- a/src/venus/fstrace.c
+++ b/src/venus/fstrace.c
@@ -1491,7 +1491,11 @@ dce1_error_inq_text(status_to_convert, error_text, status)
     char nls_filename[11];
     char alt_filename[80];
     char *message;
+#if defined(AFS_64BITPOINTER_ENV)
+    long J;
+#else
     int J;
+#endif
     static char *facility_names[] = {
        "xxx",
        "afs"
@@ -1557,8 +1561,12 @@ dce1_error_inq_text(status_to_convert, error_text, status)
 #else
     catd = (nl_catd) catopen1(nls_filename, 0);
 #endif
+#else
+#if defined(AFS_64BITPOINTER_ENV)
+    J = (long)catopen(nls_filename, 0);
 #else
     J = (int)catopen(nls_filename, 0);
+#endif
     catd = (nl_catd) J;
 #endif
     if (catd == (nl_catd) - 1) {
@@ -1580,8 +1588,12 @@ dce1_error_inq_text(status_to_convert, error_text, status)
 #else
        catd = (nl_catd) catopen1(alt_filename, 0);
 #endif
+#else
+#if defined(AFS_64BITPOINTER_ENV)
+        J = (long)catopen(alt_filename, 0);
 #else
        J = (int)catopen(alt_filename, 0);
+#endif
        catd = (nl_catd) J;
 #endif
        if (catd == (nl_catd) - 1) {