From: Karl E. Kelley <kekelley@iastate.edu>
Date: Mon, 11 Jul 2005 04:22:16 +0000 (+0000)
Subject: linux-and-64bit-cleanup-20050710
X-Git-Tag: openafs-devel-1_5_0~449
X-Git-Url: http://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=685989647d0fb31eca60e0900cea1598d5c001d8;hp=85d429528bfba3e909d9614320fbaad84473dfe3

linux-and-64bit-cleanup-20050710

FIXES 19166

fix warnings found on x86_64 linux
---

diff --git a/Makefile.in b/Makefile.in
index 09424b8..428d8f4 100644
--- 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 038db5d..a4ba07e 100644
--- 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 a78fc2e..a1d6b00 100644
--- 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 be3ad81..0627cc7 100644
--- 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 534ab48..798f981 100644
--- 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 e54a055..778ef28 100644
--- 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 6d99d48..68877ac 100644
--- 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 64f8f4e..6c0a180 100644
--- 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 92eccd9..b6b4889 100644
--- 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 8d0b584..27899cc 100644
--- 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"
@@ -1558,7 +1562,11 @@ dce1_error_inq_text(status_to_convert, error_text, status)
     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) {
@@ -1581,7 +1589,11 @@ dce1_error_inq_text(status_to_convert, error_text, status)
 	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) {