Remove all uses of __FUNCTION__ because it is not portable

diff --git a/citadel/clientsocket.c b/citadel/clientsocket.c
index e4044d630c9d892b63a44104e7b43c07f0908391..a4b521864087357dff41622fd57e027be94bae25 100644 (file)
--- a/citadel/clientsocket.c
+++ b/citadel/clientsocket.c
@@ -6,9 +6,9 @@
  *
  * Copyright (c) 1987-2011 by the citadel.org team
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
+ * This program is open source software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
 #include "sysdep.h"
@@ -86,7 +86,7 @@ int sock_connect(char *host, char *service)
 
        rc = getaddrinfo(host, service, &hints, &res);
        if (rc != 0) {
-               syslog(LOG_ERR, "%s: %s\n", host, gai_strerror(rc));
+               syslog(LOG_ERR, "%s: %s", host, gai_strerror(rc));
                return(-1);
        }
 
@@ -96,7 +96,7 @@ int sock_connect(char *host, char *service)
        for (ai = res; ai != NULL; ai = ai->ai_next) {
                sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
                if (sock < 0) {
-                       syslog(LOG_ERR, "socket() failed: %s\n", strerror(errno));
+                       syslog(LOG_ERR, "socket() failed: %s", strerror(errno));
                        freeaddrinfo(res);
                        return(-1);
                }
@@ -106,7 +106,7 @@ int sock_connect(char *host, char *service)
                        return(sock);
                }
                else {
-                       syslog(LOG_ERR, "connect() failed: %s\n", strerror(errno));
+                       syslog(LOG_ERR, "connect() failed: %s", strerror(errno));
                        close(sock);
                }
        }
@@ -140,9 +140,9 @@ int socket_read_blob(int *Socket, StrBuf * Target, int bytes, int timeout)
                                        CCC->SBuf.Buf,
                                        &CCC->SBuf.ReadWritePointer,
                                        Socket, 1, bytes, O_TERM, &Error);
+       
        if (retval < 0) {
-               syslog(LOG_CRIT,
-                             "%s failed: %s\n", __FUNCTION__, Error);
+               syslog(LOG_CRIT, "socket_read_blob() failed: %s", Error);
        }
        return retval;
 }
@@ -160,8 +160,7 @@ int CtdlSockGetLine(int *sock, StrBuf * Target, int nSec)
                                               &CCC->SBuf.ReadWritePointer,
                                               sock, nSec, 1, &Error);
        if ((rc < 0) && (Error != NULL))
-               syslog(LOG_CRIT,
-                             "%s failed: %s\n", __FUNCTION__, Error);
+               syslog(LOG_CRIT, "CtdlSockGetLine() failed: %s", Error);
        return rc;
 }
 

diff --git a/citadel/ecrash.c b/citadel/ecrash.c
index 46f5b7b286f8f56aeb7d5a13bfce868b22b12d87..1c0514a02395b047b6a9fd3120a45649b18a713f 100644 (file)
--- a/citadel/ecrash.c
+++ b/citadel/ecrash.c
@@ -45,7 +45,7 @@
 #include "citserver.h"
 #include "ecrash.h"
 
-#define NIY()  printf("%s: Not Implemented Yet!\n", __FUNCTION__)
+#define NIY()  printf("function not implemented yet!\n");
 #ifdef HAVE_BACKTRACE
 #include <execinfo.h>
 static eCrashParameters gbl_params;

diff --git a/citadel/sysdep.c b/citadel/sysdep.c
index 6c721e206e6301ee7f15803b504d964face30207..afcde00696e20a26940f9afb58e89248ddcd9771 100644 (file)
--- a/citadel/sysdep.c
+++ b/citadel/sysdep.c
@@ -583,7 +583,7 @@ int client_read_blob(StrBuf *Target, int bytes, int timeout)
 #endif
                retval = client_read_sslblob(Target, bytes, timeout);
                if (retval < 0) {
-                       syslog(LOG_CRIT, "%s failed", __FUNCTION__);
+                       syslog(LOG_CRIT, "client_read_blob() failed");
                }
 #ifdef BIGBAD_IODBG
                snprintf(fn, SIZ, "/tmp/foolog_%s.%d", CCC->ServiceName, CCC->cs_pid);
@@ -626,7 +626,7 @@ int client_read_blob(StrBuf *Target, int bytes, int timeout)
                                                O_TERM,
                                                &Error);
                if (retval < 0) {
-                       syslog(LOG_CRIT, "%s failed: %s\n", __FUNCTION__, Error);
+                       syslog(LOG_CRIT, "client_read_blob() failed: %s", Error);
                        client_close();
                        return retval;
                }
@@ -806,10 +806,9 @@ int CtdlClientGetLine(StrBuf *Target)
                         StrLength(Target), ChrPtr(Target));
                 fclose(fd);
 
-               if (rc < 0)
-                       syslog(LOG_CRIT, 
-                                     "%s failed\n",
-                                     __FUNCTION__);
+               if (rc < 0) {
+                       syslog(LOG_CRIT, "CtdlClientGetLine() failed");
+               }
 #endif
                return rc;
        }
@@ -864,11 +863,9 @@ int CtdlClientGetLine(StrBuf *Target)
                         StrLength(Target), ChrPtr(Target));
                 fclose(fd);
 
-               if ((rc < 0) && (Error != NULL))
-                       syslog(LOG_CRIT, 
-                                     "%s failed: %s\n",
-                                     __FUNCTION__,
-                                     Error);
+               if ((rc < 0) && (Error != NULL)) {
+                       syslog(LOG_CRIT, "CtdlClientGetLine() failed: %s", Error);
+               }
 #endif
                return rc;
        }
@@ -1329,7 +1326,6 @@ void *select_on_master(void *blah)
        int m;
        int i;
        int retval;
-       struct CitContext select_on_master_CC;
 
        CtdlFillSystemContext(&select_on_master_CC, "select_on_master");
        pthread_setspecific(MyConKey, (void *)&select_on_master_CC);