get rid of some more warnings

6 files changed, 44 insertions, 44 deletions

diff --git a/qmail-inject.c b/qmail-inject.c
index 753c18a..e707358 100644
--- a/qmail-inject.c
+++ b/qmail-inject.c
@@ -55,7 +55,7 @@ struct qmail qqt;
 
 void put(s,len) char *s; int len;
 { if (flagqueue) qmail_put(&qqt,s,len); else substdio_put(subfdout,s,len); }
-void puts(s) char *s; { put(s,str_len(s)); }
+void myputs(s) char *s; { put(s,str_len(s)); }
 
 void perm() { _exit(100); }
 void temp() { _exit(111); }
@@ -549,16 +549,16 @@ void finishmft()
 
   if (i == tocclist.len) return;
 
-  puts("Mail-Followup-To: ");
+  myputs("Mail-Followup-To: ");
   i = tocclist.len;
   while (i--) {
     if (!stralloc_copy(&sa,&tocclist.sa[i])) die_nomem();
     if (!stralloc_0(&sa)) die_nomem();
     if (!quote2(&sa2,sa.s)) die_nomem();
     put(sa2.s,sa2.len);
-    if (i) puts(",\n  ");
+    if (i) myputs(",\n  ");
   }
-  puts("\n");
+  myputs("\n");
 }
 
 void finishheader()
@@ -580,9 +580,9 @@ void finishheader()
    if (!stralloc_0(&sa)) die_nomem();
    if (!quote2(&sa2,sa.s)) die_nomem();
 
-   puts("Return-Path: <");
+   myputs("Return-Path: <");
    put(sa2.s,sa2.len);
-   puts(">\n");
+   myputs(">\n");
   }
 
  /* could check at this point whether there are any recipients */
@@ -594,23 +594,23 @@ void finishheader()
    if (!htypeseen[H_R_DATE])
     {
      if (!newfield_datemake(starttime)) die_nomem();
-     puts("Resent-");
+     myputs("Resent-");
      put(newfield_date.s,newfield_date.len);
     }
    if (!htypeseen[H_R_MESSAGEID])
     {
      if (!newfield_msgidmake(control_idhost.s,control_idhost.len,starttime)) die_nomem();
-     puts("Resent-");
+     myputs("Resent-");
      put(newfield_msgid.s,newfield_msgid.len);
     }
    if (!htypeseen[H_R_FROM])
     {
      defaultfrommake();
-     puts("Resent-");
+     myputs("Resent-");
      put(defaultfrom.s,defaultfrom.len);
     }
    if (!htypeseen[H_R_TO] && !htypeseen[H_R_CC])
-     puts("Resent-Cc: recipient list not shown: ;\n");
+     myputs("Resent-Cc: recipient list not shown: ;\n");
   }
  else
   {
@@ -630,7 +630,7 @@ void finishheader()
      put(defaultfrom.s,defaultfrom.len);
     }
    if (!htypeseen[H_TO] && !htypeseen[H_CC])
-     puts("Cc: recipient list not shown: ;\n");
+     myputs("Cc: recipient list not shown: ;\n");
    finishmft();
   }
 
diff --git a/qmail-pop3d.c b/qmail-pop3d.c
index 2228a4d..c11fd1d 100644
--- a/qmail-pop3d.c
+++ b/qmail-pop3d.c
@@ -45,7 +45,7 @@ void put(buf,len) char *buf; int len;
 {
   substdio_put(&ssout,buf,len);
 }
-void puts(s) char *s;
+void myputs(s) char *s;
 {
   substdio_puts(&ssout,s);
 }
@@ -55,9 +55,9 @@ void flush()
 }
 void err(s) char *s;
 {
-  puts("-ERR ");
-  puts(s);
-  puts("\r\n");
+  myputs("-ERR ");
+  myputs(s);
+  myputs("\r\n");
   flush();
 }
 
@@ -73,7 +73,7 @@ void err_toobig() { err("not that many messages"); }
 void err_nosuch() { err("unable to open that message"); }
 void err_nounlink() { err("unable to unlink all deleted messages"); }
 
-void okay(arg) char *arg; { puts("+OK \r\n"); flush(); }
+void okay(arg) char *arg; { myputs("+OK \r\n"); flush(); }
 
 void printfn(fn) char *fn;
 {
@@ -153,11 +153,11 @@ void pop3_stat(arg) char *arg;
  
   total = 0;
   for (i = 0;i < numm;++i) if (!m[i].flagdeleted) { total += m[i].size; j++; }
-  puts("+OK ");
+  myputs("+OK ");
   put(strnum,fmt_uint(strnum,j));
-  puts(" ");
+  myputs(" ");
   put(strnum,fmt_ulong(strnum,total));
-  puts("\r\n");
+  myputs("\r\n");
   flush();
 }
 
@@ -171,9 +171,9 @@ void pop3_rset(arg) char *arg;
 
 void pop3_last(arg) char *arg;
 {
-  puts("+OK ");
+  myputs("+OK ");
   put(strnum,fmt_uint(strnum,last));
-  puts("\r\n");
+  myputs("\r\n");
   flush();
 }
 
@@ -222,10 +222,10 @@ int i;
 int flaguidl;
 {
   put(strnum,fmt_uint(strnum,i + 1));
-  puts(" ");
+  myputs(" ");
   if (flaguidl) printfn(m[i].fn);
   else put(strnum,fmt_ulong(strnum,m[i].size));
-  puts("\r\n");
+  myputs("\r\n");
 }
 
 void dolisting(arg,flaguidl) char *arg; int flaguidl;
@@ -234,7 +234,7 @@ void dolisting(arg,flaguidl) char *arg; int flaguidl;
   if (*arg) {
     i = msgno(arg);
     if (i == -1) return;
-    puts("+OK ");
+    myputs("+OK ");
     list(i,flaguidl);
   }
   else {
@@ -242,7 +242,7 @@ void dolisting(arg,flaguidl) char *arg; int flaguidl;
     for (i = 0;i < numm;++i)
       if (!m[i].flagdeleted)
 	list(i,flaguidl);
-    puts(".\r\n");
+    myputs(".\r\n");
   }
   flush();
 }
diff --git a/qmail-popup.c b/qmail-popup.c
index 906da67..a18b73e 100644
--- a/qmail-popup.c
+++ b/qmail-popup.c
@@ -38,7 +38,7 @@ substdio ssout = SUBSTDIO_FDBUF(safewrite,1,ssoutbuf,sizeof ssoutbuf);
 char ssinbuf[128];
 substdio ssin = SUBSTDIO_FDBUF(saferead,0,ssinbuf,sizeof ssinbuf);
 
-void puts(s) char *s;
+void myputs(s) char *s;
 {
   substdio_puts(&ssout,s);
 }
@@ -48,9 +48,9 @@ void flush()
 }
 void err(s) char *s;
 {
-  puts("-ERR ");
-  puts(s);
-  puts("\r\n");
+  myputs("-ERR ");
+  myputs(s);
+  myputs("\r\n");
   flush();
 }
 
@@ -66,7 +66,7 @@ void err_syntax() { err("syntax error"); }
 void err_wantuser() { err("USER first"); }
 void err_authoriz(arg) char *arg; { err("authorization first"); }
 
-void okay(arg) char *arg; { puts("+OK \r\n"); flush(); }
+void okay(arg) char *arg; { myputs("+OK \r\n"); flush(); }
 void pop3_quit(arg) char *arg; { okay(0); die(); }
 
 
@@ -127,10 +127,10 @@ void pop3_greet()
   s += fmt_ulong(s,(unsigned long) now());
   *s++ = '@';
   *s++ = 0;
-  puts("+OK <");
-  puts(unique);
-  puts(hostname);
-  puts(">\r\n");
+  myputs("+OK <");
+  myputs(unique);
+  myputs(hostname);
+  myputs(">\r\n");
   flush();
 }
 void pop3_user(arg) char *arg;
diff --git a/qmail-send.c b/qmail-send.c
index 1646a5d..456d416 100644
--- a/qmail-send.c
+++ b/qmail-send.c
@@ -761,7 +761,7 @@ I tried to deliver a bounce message to this address, but the bounce bounced!\n\
     { log1("warning: trouble injecting bounce message, will try later\n"); return 0; }
 
    strnum2[fmt_ulong(strnum2,id)] = 0;
-   log2("bounce msg ",strnum2);
+   Log2("bounce msg ",strnum2);
    strnum2[fmt_ulong(strnum2,qp)] = 0;
    log3(" qp ",strnum2,"\n");
   }
@@ -801,8 +801,8 @@ void del_status()
   for (c = 0;c < CHANNELS;++c) {
     strnum2[fmt_ulong(strnum2,(unsigned long) concurrencyused[c])] = 0;
     strnum3[fmt_ulong(strnum3,(unsigned long) concurrency[c])] = 0;
-    log2(chanstatusmsg[c],strnum2);
-    log2("/",strnum3);
+    Log2(chanstatusmsg[c],strnum2);
+    Log2("/",strnum3);
   }
   if (flagexitasap) log1(" exitasap");
   log1("\n");
@@ -866,7 +866,7 @@ char *recip;
 
  strnum2[fmt_ulong(strnum2,d[c][i].delid)] = 0;
  strnum3[fmt_ulong(strnum3,jo[j].id)] = 0;
- log2("starting delivery ",strnum2);
+ Log2("starting delivery ",strnum2);
  log3(": msg ",strnum3,tochan[c]);
  logsafe(recip);
  log1("\n");
@@ -1359,14 +1359,14 @@ fd_set *rfds;
 	 fnmake_info(id);
          log3("warning: trouble writing to ",fn.s,"\n"); goto fail;
 	}
-       log2("info msg ",strnum3);
+       Log2("info msg ",strnum3);
        strnum2[fmt_ulong(strnum2,(unsigned long) st.st_size)] = 0;
-       log2(": bytes ",strnum2);
+       Log2(": bytes ",strnum2);
        log1(" envelope_from <"); logsafe(todoline.s + 1);
        strnum2[fmt_ulong(strnum2,pid)] = 0;
-       log2("> qp ",strnum2);
+       Log2("> qp ",strnum2);
        strnum2[fmt_ulong(strnum2,uid)] = 0;
-       log2(" uid ",strnum2);
+       Log2(" uid ",strnum2);
        log1("\n");
        break;
      case 'T':
diff --git a/qsutil.c b/qsutil.c
index 80c619d..59e68c7 100644
--- a/qsutil.c
+++ b/qsutil.c
@@ -12,7 +12,7 @@ void logsa(sa) stralloc *sa; {
  substdio_putflush(&sserr,sa->s,sa->len); }
 void log1(s1) char *s1; {
  substdio_putsflush(&sserr,s1); }
-void log2(s1,s2) char *s1; char *s2; {
+void Log2(s1,s2) char *s1; char *s2; {
  substdio_putsflush(&sserr,s1);
  substdio_putsflush(&sserr,s2); }
 void log3(s1,s2,s3) char *s1; char *s2; char *s3; {
diff --git a/qsutil.h b/qsutil.h
index a746845..028d03f 100644
--- a/qsutil.h
+++ b/qsutil.h
@@ -2,7 +2,7 @@
 #define QSUTIL_H
 
 extern void log1();
-extern void log2();
+extern void Log2();
 extern void log3();
 extern void logsa();
 extern void nomem();