Merge branch 'master' of gitorious.org:fetchmail/fetchmail

1 files changed, 16 insertions, 16 deletions

diff --git a/smbutil.c b/smbutil.c
index ed6ec8a5..78041ae9 100644
--- a/smbutil.c
+++ b/smbutil.c
@@ -44,23 +44,23 @@ else \
 
 #define AddString(ptr, header, string) \
 { \
-char *p = string; \
-int len = 0; \
-if (p) len = strlen(p); \
-AddBytes(ptr, header, ((unsigned char*)p), len); \
+char *p_ = string; \
+int len_ = 0; \
+if (p_) len_ = strlen(p_); \
+AddBytes(ptr, header, ((unsigned char*)p_), len_); \
 }
 
 #define AddUnicodeString(ptr, header, string) \
 { \
-char *p = string; \
-unsigned char *b = NULL; \
-int len = 0; \
-if (p) \
+char *p_ = string; \
+unsigned char *b_ = NULL; \
+int len_ = 0; \
+if (p_) \
   { \
-  len = strlen(p); \
-  b = strToUnicode(p); \
+  len_ = strlen(p_); \
+  b_ = strToUnicode(p_); \
   } \
-AddBytes(ptr, header, b, len*2); \
+AddBytes(ptr, header, b_, len_*2); \
 }
 
 
@@ -148,17 +148,17 @@ void dumpSmbNtlmAuthRequest(FILE *fp, tSmbNtlmAuthRequest *request)
   {
   fprintf(fp,"NTLM Request:\n");
   fprintf(fp,"      Ident = %s\n",request->ident);
-  fprintf(fp,"      mType = %d\n",IVAL(&request->msgType,0));
+  fprintf(fp,"      mType = %ld\n",(long int)IVAL(&request->msgType,0));
   fprintf(fp,"      Flags = %08x\n",IVAL(&request->flags,0));
-  fprintf(fp,"       User = %s\n",GetString(request,user));
-  fprintf(fp,"     Domain = %s\n",GetString(request,domain));
+  fprintf(fp,"       User = %s\n",(char *)GetString(request,user));
+  fprintf(fp,"     Domain = %s\n",(char *)GetString(request,domain));
   }
 
 void dumpSmbNtlmAuthChallenge(FILE *fp, tSmbNtlmAuthChallenge *challenge)
   {
   fprintf(fp,"NTLM Challenge:\n");
   fprintf(fp,"      Ident = %s\n",challenge->ident);
-  fprintf(fp,"      mType = %d\n",IVAL(&challenge->msgType,0));
+  fprintf(fp,"      mType = %ld\n",(long int)IVAL(&challenge->msgType,0));
   fprintf(fp,"     Domain = %s\n",GetUnicodeString(challenge,uDomain));
   fprintf(fp,"      Flags = %08x\n",IVAL(&challenge->flags,0));
   fprintf(fp,"  Challenge = "); dumpRaw(fp, challenge->challengeData,8);
@@ -168,7 +168,7 @@ void dumpSmbNtlmAuthResponse(FILE *fp, tSmbNtlmAuthResponse *response)
   {
   fprintf(fp,"NTLM Response:\n");
   fprintf(fp,"      Ident = %s\n",response->ident);
-  fprintf(fp,"      mType = %d\n",IVAL(&response->msgType,0));
+  fprintf(fp,"      mType = %ld\n",(long int)IVAL(&response->msgType,0));
   fprintf(fp,"     LmResp = "); DumpBuffer(fp,response,lmResponse);
   fprintf(fp,"     NTResp = "); DumpBuffer(fp,response,ntResponse);
   fprintf(fp,"     Domain = %s\n",GetUnicodeString(response,uDomain));