*
* 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,
*
* 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"
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);
}
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);
}
return(sock);
}
else {
- syslog(LOG_ERR, "connect() failed: %s\n", strerror(errno));
+ syslog(LOG_ERR, "connect() failed: %s", strerror(errno));
close(sock);
}
}
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;
}
&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;
}
#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);
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;
}
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;
}
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;
}
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);