From: Derrick Brashear Date: Mon, 28 Sep 2009 13:21:59 +0000 (-0400) Subject: macos 10.6 warning fixes X-Git-Tag: openafs-devel-1_5_65~23 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=be34175e0f089cbf8a90a0afc7362432be004e06;p=packages%2Fo%2Fopenafs.git macos 10.6 warning fixes due to 32/64 and a newer compiler, macos 10.6 finds more warnings. these are fixes for some of them. Reviewed-on: http://gerrit.openafs.org/533 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- diff --git a/src/butc/dump.c b/src/butc/dump.c index 60975bce6..5a1228c2c 100644 --- a/src/butc/dump.c +++ b/src/butc/dump.c @@ -299,9 +299,9 @@ dumpVolume(struct tc_dumpDesc * curDump, struct dumpRock * dparamsPtr) /* Create and Write the volume header */ makeVolumeHeader(&hostVolumeHeader, dparamsPtr, fragmentNumber); hostVolumeHeader.contd = ((fragmentNumber == 1) ? 0 : TC_VOLCONTD); - volumeHeader_hton(&hostVolumeHeader, buffer); + volumeHeader_hton(&hostVolumeHeader, (struct volumeHeader *)buffer); - rc = butm_WriteFileData(tapeInfoPtr, buffer, 1, + rc = butm_WriteFileData(tapeInfoPtr, (struct volumeHeader *)buffer, 1, sizeof(hostVolumeHeader)); if (rc) { ErrorLog(1, taskId, rc, tapeInfoPtr->error, @@ -644,10 +644,10 @@ xbsaDumpVolume(struct tc_dumpDesc * curDump, struct dumpRock * dparamsPtr) /* Create and Write the volume header */ makeVolumeHeader(&hostVolumeHeader, dparamsPtr, 1); hostVolumeHeader.contd = 0; - volumeHeader_hton(&hostVolumeHeader, buffer); + volumeHeader_hton(&hostVolumeHeader, (struct volumeHeader *)buffer); - rc = xbsa_WriteObjectData(&butxInfo, buffer, sizeof(struct volumeHeader), - &bytesWritten); + rc = xbsa_WriteObjectData(&butxInfo, (struct volumeHeader *)buffer, + sizeof(struct volumeHeader), &bytesWritten); if (rc != XBSA_SUCCESS) { ErrorLog(1, taskId, rc, 0, "Unable to write VolumeHeader data to the server\n"); diff --git a/src/des/make_fp.c b/src/des/make_fp.c index 74e8b7472..211e0f963 100644 --- a/src/des/make_fp.c +++ b/src/des/make_fp.c @@ -46,7 +46,7 @@ gen(FILE * stream) #ifdef AFS_DARWIN80_ENV for(j = 0;; j++) { - fprintf(stream, _darwin_whichstr[j]); + fprintf(stream, "%s", _darwin_whichstr[j]); if (j == 2) break; #endif /* AFS_DARWIN80_ENV */ diff --git a/src/des/make_ip.c b/src/des/make_ip.c index 5d699bbb4..2fed60e50 100644 --- a/src/des/make_ip.c +++ b/src/des/make_ip.c @@ -40,7 +40,7 @@ gen(FILE * stream) #ifdef AFS_DARWIN80_ENV for(j = 0;; j++) { - fprintf(stream, _darwin_whichstr[j]); + fprintf(stream, "%s", _darwin_whichstr[j]); if (j == 2) break; #endif /* AFS_DARWIN80_ENV */ diff --git a/src/des/read_pssword.c b/src/des/read_pssword.c index 18fa9e0ec..de4b43a47 100644 --- a/src/des/read_pssword.c +++ b/src/des/read_pssword.c @@ -250,7 +250,7 @@ des_read_pw_string(char *s, int maxa, char *prompt, int verify) #endif #endif while (!ok) { - (void)printf(prompt); + (void)printf("%s", prompt); (void)fflush(stdout); #ifdef CROSSMSDOS h19line(s, sizeof(s), 0); diff --git a/src/kauth/admin_tools.c b/src/kauth/admin_tools.c index 982c128f9..45842649b 100644 --- a/src/kauth/admin_tools.c +++ b/src/kauth/admin_tools.c @@ -1290,7 +1290,8 @@ static int MyBeforeProc(struct cmd_syndesc *as, void *arock) { struct ktc_encryptionKey key; - struct ktc_principal auth_server, auth_token, client; + struct ktc_principal auth_server, client; + struct ktc_token auth_token; char realm[MAXKTCREALMLEN]; struct ktc_token token, *pToken; diff --git a/src/kauth/ka-forwarder.c b/src/kauth/ka-forwarder.c index 3bfa4b11d..f894353bc 100644 --- a/src/kauth/ka-forwarder.c +++ b/src/kauth/ka-forwarder.c @@ -207,7 +207,8 @@ main(int argc, char **argv) for (;;) { char buf[BUFFER_SIZE], *bufp, *sendptr; struct sockaddr_in from, reply, *to; - size_t fromlen, sendlen; + size_t sendlen; + socklen_t fromlen; bufp = buf + 8; fromlen = sizeof(from); diff --git a/src/kauth/kaprocs.c b/src/kauth/kaprocs.c index ec2361163..c2deadc84 100644 --- a/src/kauth/kaprocs.c +++ b/src/kauth/kaprocs.c @@ -299,7 +299,7 @@ init_kaprocs(const char *lclpath, int initFlags) return code; } - kaux_opendb(lclpath); /* aux database stores failure counters */ + kaux_opendb((char *)lclpath);/* aux database stores failure counters */ rebuildDatabase = 0; /* only do this during init */ kaprocsInited = 1; return 0; diff --git a/src/kauth/kaserver.c b/src/kauth/kaserver.c index 460620230..cce632ea5 100644 --- a/src/kauth/kaserver.c +++ b/src/kauth/kaserver.c @@ -384,11 +384,11 @@ main(int argc, char *argv[]) if (servers) code = ubik_ServerInit(myHost, htons(AFSCONF_KAUTHPORT), serverList, - dbpath, &KA_dbase); + (char *)dbpath, &KA_dbase); else code = ubik_ServerInitByInfo(myHost, htons(AFSCONF_KAUTHPORT), &cellinfo, - clones, dbpath, &KA_dbase); + clones, (char *)dbpath, &KA_dbase); if (code) { afs_com_err(whoami, code, "Ubik init failed"); diff --git a/src/lwp/lwp.c b/src/lwp/lwp.c index 66eb74465..0fe7514f7 100644 --- a/src/lwp/lwp.c +++ b/src/lwp/lwp.c @@ -934,9 +934,9 @@ Dispatcher(void) #endif printf("stackcheck = %u: stack = %u \n", lwp_cpptr->stackcheck, *(int *)lwp_cpptr->stack); - printf("topstack = 0x%x: stackptr = 0x%x: stacksize = 0x%x\n", - (uintptr_t)lwp_cpptr->context.topstack, - (uintptr_t)lwp_cpptr->stack, + printf("topstack = 0x%" AFS_PTR_FMT ": stackptr = 0x%" AFS_PTR_FMT ": stacksize = 0x%x\n", + (void *)(uintptr_t)lwp_cpptr->context.topstack, + (void *)(uintptr_t)lwp_cpptr->stack, lwp_cpptr->stacksize); switch (lwp_overflowAction) { diff --git a/src/ptserver/ptserver.c b/src/ptserver/ptserver.c index 4b046e908..0a764ba4c 100644 --- a/src/ptserver/ptserver.c +++ b/src/ptserver/ptserver.c @@ -522,7 +522,7 @@ main(int argc, char **argv) code = ubik_ServerInitByInfo(myHost, htons(AFSCONF_PROTPORT), &info, clones, - pr_dbaseName, &dbase); + (char *)pr_dbaseName, &dbase); if (code) { afs_com_err(whoami, code, "Ubik init failed"); PT_EXIT(2); diff --git a/src/vol/fssync-debug.c b/src/vol/fssync-debug.c index 126e5c7c7..304b93a8b 100644 --- a/src/vol/fssync-debug.c +++ b/src/vol/fssync-debug.c @@ -1046,7 +1046,7 @@ VnQuery(struct cmd_syndesc * as, void * rock) } #endif /* !AFS_DEMAND_ATTACH_FS */ - printf("\twriter = %u\n", (uintptr_t)v.writer); + printf("\twriter = %"AFS_PTR_FMT"\n", (uintptr_t)v.writer); printf("\tvcp = %p\n", v.vcp); printf("\thandle = %p\n", v.handle); diff --git a/src/vol/salvager.c b/src/vol/salvager.c index d10130d85..5a93a5f89 100644 --- a/src/vol/salvager.c +++ b/src/vol/salvager.c @@ -268,7 +268,7 @@ handleit(struct cmd_syndesc *as, void *arock) } if ((ti = as->parms[18].items)) { /* -datelogs */ - TimeStampLogFile(AFSDIR_SERVER_SLVGLOG_FILEPATH); + TimeStampLogFile((char *)AFSDIR_SERVER_SLVGLOG_FILEPATH); } #endif @@ -410,7 +410,7 @@ main(int argc, char **argv) * multiple salvagers appending to the log. */ - CheckLogFile(AFSDIR_SERVER_SLVGLOG_FILEPATH); + CheckLogFile((char *)AFSDIR_SERVER_SLVGLOG_FILEPATH); #ifndef AFS_NT40_ENV #ifdef AFS_LINUX20_ENV fcntl(fileno(logFile), F_SETFL, O_APPEND); /* Isn't this redundant? */