projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
106ef37
)
getting with the times, we dont need to wrap snprintf anymore
author
Art Cancro
<ajc@uncensored.citadel.org>
Tue, 20 Nov 2012 04:24:17 +0000
(23:24 -0500)
committer
Art Cancro
<ajc@uncensored.citadel.org>
Tue, 20 Nov 2012 04:24:17 +0000
(23:24 -0500)
26 files changed:
citadel/Makefile.in
patch
|
blob
|
history
citadel/citserver.c
patch
|
blob
|
history
citadel/clientsocket.c
patch
|
blob
|
history
citadel/context.c
patch
|
blob
|
history
citadel/control.c
patch
|
blob
|
history
citadel/file_ops.c
patch
|
blob
|
history
citadel/include/ctdl_module.h
patch
|
blob
|
history
citadel/internet_addressing.c
patch
|
blob
|
history
citadel/modules/imap/imap_tools.c
patch
|
blob
|
history
citadel/modules/instmsg/serv_instmsg.c
patch
|
blob
|
history
citadel/modules/listsub/serv_listsub.c
patch
|
blob
|
history
citadel/modules/managesieve/serv_managesieve.c
patch
|
blob
|
history
citadel/modules/network/serv_netconfig.c
patch
|
blob
|
history
citadel/modules/network/serv_netmail.c
patch
|
blob
|
history
citadel/modules/network/serv_netspool.c
patch
|
blob
|
history
citadel/modules/network/serv_network.c
patch
|
blob
|
history
citadel/modules/network/serv_networkclient.c
patch
|
blob
|
history
citadel/modules/roomchat/serv_roomchat.c
patch
|
blob
|
history
citadel/modules/smtp/serv_smtp.c
patch
|
blob
|
history
citadel/serv_extensions.c
patch
|
blob
|
history
citadel/server_main.c
patch
|
blob
|
history
citadel/sysdep.c
patch
|
blob
|
history
citadel/utils/aidepost.c
patch
|
blob
|
history
citadel/utils/citmail.c
patch
|
blob
|
history
webcit/sysdep.c
patch
|
blob
|
history
webcit/webserver.c
patch
|
blob
|
history
diff --git
a/citadel/Makefile.in
b/citadel/Makefile.in
index e6018be85b5b0346b9450a3d138406ba74d2e072..553ea04356c939ab807a3c57e95d41b380333707 100644
(file)
--- a/
citadel/Makefile.in
+++ b/
citadel/Makefile.in
@@
-81,7
+81,7
@@
SOURCES=utils/aidepost.c utils/citmail.c \
domain.c serv_extensions.c file_ops.c genstamp.c \
housekeeping.c ical_dezonify.c internet_addressing.c ecrash.c \
locate_host.c md5.c auth.c msgbase.c parsedate.c \
domain.c serv_extensions.c file_ops.c genstamp.c \
housekeeping.c ical_dezonify.c internet_addressing.c ecrash.c \
locate_host.c md5.c auth.c msgbase.c parsedate.c \
- room_ops.c euidindex.c server_main.c
snprintf.c
ldap.c \
+ room_ops.c euidindex.c server_main.c ldap.c \
support.c sysdep.c user_ops.c journaling.c threads.c \
context.c event_client.c
support.c sysdep.c user_ops.c journaling.c threads.c \
context.c event_client.c
diff --git
a/citadel/citserver.c
b/citadel/citserver.c
index 0c8955a8a2b3fb10386b589818e6a3618aff6088..761947375d2fb08dfa1463b92e779a0e3d74b662 100644
(file)
--- a/
citadel/citserver.c
+++ b/
citadel/citserver.c
@@
-65,11
+65,6
@@
#include "euidindex.h"
#include "context.h"
#include "svn_revision.h"
#include "euidindex.h"
#include "context.h"
#include "svn_revision.h"
-
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
-
#include "ctdl_module.h"
char *unique_session_numbers;
#include "ctdl_module.h"
char *unique_session_numbers;
diff --git
a/citadel/clientsocket.c
b/citadel/clientsocket.c
index 1f163c222ef1ce5f8cdd33a848a0bccf11221aef..ef20ac7b6a7daaffa1f0ff551e4d896d47acb5b6 100644
(file)
--- a/
citadel/clientsocket.c
+++ b/
citadel/clientsocket.c
@@
-34,9
+34,6
@@
#include <libcitadel.h>
#include "citadel.h"
#include "server.h"
#include <libcitadel.h>
#include "citadel.h"
#include "server.h"
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
#include "sysdep_decls.h"
#include "config.h"
#include "clientsocket.h"
#include "sysdep_decls.h"
#include "config.h"
#include "clientsocket.h"
diff --git
a/citadel/context.c
b/citadel/context.c
index 80c41a92a37360721297db19685a8a55872fa0f0..86bf5c0d9a199b67cd2617158243fc048d226e44 100644
(file)
--- a/
citadel/context.c
+++ b/
citadel/context.c
@@
-69,10
+69,6
@@
#include <sys/select.h>
#endif
#include <sys/select.h>
#endif
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
-
#include "ctdl_module.h"
#include "threads.h"
#include "user_ops.h"
#include "ctdl_module.h"
#include "threads.h"
#include "user_ops.h"
diff --git
a/citadel/control.c
b/citadel/control.c
index b81526cf1dc855078349afb8ed70a4803bb0388d..ea1591f9c448943d8ffbdf8a83fa581b9f30f3f1 100644
(file)
--- a/
citadel/control.c
+++ b/
citadel/control.c
@@
-50,11
+50,6
@@
#include "user_ops.h"
#include "database.h"
#include "threads.h"
#include "user_ops.h"
#include "database.h"
#include "threads.h"
-
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
-
#include "ctdl_module.h"
struct CitControl CitControl;
#include "ctdl_module.h"
struct CitControl CitControl;
diff --git
a/citadel/file_ops.c
b/citadel/file_ops.c
index a3e8d749859590c8ea035e51a59f9ab010ea71b0..b52915e70ae0da62f4ca41e07d4b1a7f9dac9a29 100644
(file)
--- a/
citadel/file_ops.c
+++ b/
citadel/file_ops.c
@@
-37,11
+37,6
@@
#include "msgbase.h"
#include "citserver.h"
#include "threads.h"
#include "msgbase.h"
#include "citserver.h"
#include "threads.h"
-
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
-
#include "ctdl_module.h"
#include "user_ops.h"
#include "ctdl_module.h"
#include "user_ops.h"
diff --git
a/citadel/include/ctdl_module.h
b/citadel/include/ctdl_module.h
index 0287daa7be280d459bbc76e9d7704ee0a5ab81d8..12926921509fb8f14ad0351e970a1332506ef411 100644
(file)
--- a/
citadel/include/ctdl_module.h
+++ b/
citadel/include/ctdl_module.h
@@
-45,12
+45,6
@@
#endif
#include <limits.h>
#endif
#include <limits.h>
-
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
-
-
#include <libcitadel.h>
#include "server.h"
#include <libcitadel.h>
#include "server.h"
diff --git
a/citadel/internet_addressing.c
b/citadel/internet_addressing.c
index e082b13b59287dccaa9e4a9d2fcb7b39b8081e67..3237007d60a27d6a06d8153697f972049c49490b 100644
(file)
--- a/
citadel/internet_addressing.c
+++ b/
citadel/internet_addressing.c
@@
-41,14
+41,7
@@
#include "room_ops.h"
#include "parsedate.h"
#include "database.h"
#include "room_ops.h"
#include "parsedate.h"
#include "database.h"
-
#include "ctdl_module.h"
#include "ctdl_module.h"
-
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
-
-
#ifdef HAVE_ICONV
#include <iconv.h>
#ifdef HAVE_ICONV
#include <iconv.h>
diff --git
a/citadel/modules/imap/imap_tools.c
b/citadel/modules/imap/imap_tools.c
index e3cc6bffce11a878c15b5f25e8783ae4c51ccd89..bced70fd1f3e4fd50a035b368d594a284ca3eebe 100644
(file)
--- a/
citadel/modules/imap/imap_tools.c
+++ b/
citadel/modules/imap/imap_tools.c
@@
-34,10
+34,6
@@
#include "imap_tools.h"
#include "ctdl_module.h"
#include "imap_tools.h"
#include "ctdl_module.h"
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
-
/* String handling helpers */
/* This code uses some pretty nasty string manipulation. To make everything
/* String handling helpers */
/* This code uses some pretty nasty string manipulation. To make everything
diff --git
a/citadel/modules/instmsg/serv_instmsg.c
b/citadel/modules/instmsg/serv_instmsg.c
index 040c1b42edef254d3b9c4b0fbc244336171eb594..d84ce6244070503ba26030954d58b9410ab7ef37 100644
(file)
--- a/
citadel/modules/instmsg/serv_instmsg.c
+++ b/
citadel/modules/instmsg/serv_instmsg.c
@@
-5,18
+5,11
@@
*
* This program is open source software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 3.
*
* This program is open source software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 3.
- *
- *
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
- *
- *
- *
- *
*/
#include "sysdep.h"
#include <stdlib.h>
*/
#include "sysdep.h"
#include <stdlib.h>
@@
-51,11
+44,6
@@
#include "config.h"
#include "msgbase.h"
#include "user_ops.h"
#include "config.h"
#include "msgbase.h"
#include "user_ops.h"
-
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
-
#include "ctdl_module.h"
struct imlog {
#include "ctdl_module.h"
struct imlog {
diff --git
a/citadel/modules/listsub/serv_listsub.c
b/citadel/modules/listsub/serv_listsub.c
index a233e6c0e4d349a1b2c0c634fc46a24a40e3285d..8940c952eb7203ab3794659f22cdbe251dc4fc37 100644
(file)
--- a/
citadel/modules/listsub/serv_listsub.c
+++ b/
citadel/modules/listsub/serv_listsub.c
@@
-3,20
+3,13
@@
*
* Copyright (c) 2002-2012 by the citadel.org team
*
*
* Copyright (c) 2002-2012 by the citadel.org team
*
- *
This program is open source software; you can redistribute it and/or modify
- *
it under the terms of the GNU General Public License version 3.
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3.
*
*
- *
- *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
- *
- *
- *
- *
*/
#include "sysdep.h"
*/
#include "sysdep.h"
@@
-56,16
+49,8
@@
#include "internet_addressing.h"
#include "clientsocket.h"
#include "file_ops.h"
#include "internet_addressing.h"
#include "clientsocket.h"
#include "file_ops.h"
-
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
-
-
-
#include "ctdl_module.h"
#include "ctdl_module.h"
-
/*
* Generate a randomizationalisticized token to use for authentication of
* a subscribe or unsubscribe request.
/*
* Generate a randomizationalisticized token to use for authentication of
* a subscribe or unsubscribe request.
diff --git
a/citadel/modules/managesieve/serv_managesieve.c
b/citadel/modules/managesieve/serv_managesieve.c
index a256d3debf12d2d7073f0083e580358234f580f4..4fa99a72aa0da21da3dd13b867dc61ee25b23106 100644
(file)
--- a/
citadel/modules/managesieve/serv_managesieve.c
+++ b/
citadel/modules/managesieve/serv_managesieve.c
@@
-8,19
+8,13
@@
*
* Copyright (c) 2007-2012 by the citadel.org team
*
*
* Copyright (c) 2007-2012 by the citadel.org team
*
- * This program is open source software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3.
- *
- *
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3.
*
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- *
- *
- *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*/
#include "sysdep.h"
*/
#include "sysdep.h"
@@
-68,17
+62,11
@@
#include "clientsocket.h"
#include "locate_host.h"
#include "citadel_dirs.h"
#include "clientsocket.h"
#include "locate_host.h"
#include "citadel_dirs.h"
-
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
-
-
#include "ctdl_module.h"
#include "serv_sieve.h"
#include "ctdl_module.h"
#include "serv_sieve.h"
-/*
*
+/*
* http://tools.ietf.org/html/draft-martin-managesieve-06
*
* this is the draft this code tries to implement.
* http://tools.ietf.org/html/draft-martin-managesieve-06
*
* this is the draft this code tries to implement.
diff --git
a/citadel/modules/network/serv_netconfig.c
b/citadel/modules/network/serv_netconfig.c
index b250e6d729869520eaca4804f46e86de3c3950cf..0aed2938bf89f4b481aa7147aa79f0a4baa37999 100644
(file)
--- a/
citadel/modules/network/serv_netconfig.c
+++ b/
citadel/modules/network/serv_netconfig.c
@@
-5,19
+5,13
@@
* Copyright (c) 2000-2012 by the citadel.org team
*
* This program is open source software; you can redistribute it and/or modify
* Copyright (c) 2000-2012 by the citadel.org team
*
* 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.
+ * it under the terms of the GNU General Public License, version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * 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
- *
* ** NOTE ** A word on the S_NETCONFIGS semaphore:
* This is a fairly high-level type of critical section. It ensures that no
* two threads work on the netconfigs files at the same time. Since we do
* ** NOTE ** A word on the S_NETCONFIGS semaphore:
* This is a fairly high-level type of critical section. It ensures that no
* two threads work on the netconfigs files at the same time. Since we do
@@
-81,11
+75,6
@@
#include "file_ops.h"
#include "citadel_dirs.h"
#include "threads.h"
#include "file_ops.h"
#include "citadel_dirs.h"
#include "threads.h"
-
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
-
#include "context.h"
#include "netconfig.h"
#include "netspool.h"
#include "context.h"
#include "netconfig.h"
#include "netspool.h"
diff --git
a/citadel/modules/network/serv_netmail.c
b/citadel/modules/network/serv_netmail.c
index 4270009fafab8658c0c5a5fdb35cba952d2183bf..a793c5f600b0151984a576213cb944d43f39bfed 100644
(file)
--- a/
citadel/modules/network/serv_netmail.c
+++ b/
citadel/modules/network/serv_netmail.c
@@
-5,19
+5,13
@@
* Copyright (c) 2000-2012 by the citadel.org team
*
* This program is open source software; you can redistribute it and/or modify
* Copyright (c) 2000-2012 by the citadel.org team
*
* 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.
+ * it under the terms of the GNU General Public License, version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * 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
- *
* ** NOTE ** A word on the S_NETCONFIGS semaphore:
* This is a fairly high-level type of critical section. It ensures that no
* two threads work on the netconfigs files at the same time. Since we do
* ** NOTE ** A word on the S_NETCONFIGS semaphore:
* This is a fairly high-level type of critical section. It ensures that no
* two threads work on the netconfigs files at the same time. Since we do
@@
-81,11
+75,6
@@
#include "file_ops.h"
#include "citadel_dirs.h"
#include "threads.h"
#include "file_ops.h"
#include "citadel_dirs.h"
#include "threads.h"
-
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
-
#include "context.h"
#include "netconfig.h"
#include "netspool.h"
#include "context.h"
#include "netconfig.h"
#include "netspool.h"
diff --git
a/citadel/modules/network/serv_netspool.c
b/citadel/modules/network/serv_netspool.c
index 1aeb10ffc1537421996d66b255c214ee7f4e9f2d..f333e4bb180a1c5281a13ad8b39847c0f05abe03 100644
(file)
--- a/
citadel/modules/network/serv_netspool.c
+++ b/
citadel/modules/network/serv_netspool.c
@@
-5,19
+5,13
@@
* Copyright (c) 2000-2012 by the citadel.org team
*
* This program is open source software; you can redistribute it and/or modify
* Copyright (c) 2000-2012 by the citadel.org team
*
* 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.
+ * it under the terms of the GNU General Public License, version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * 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
- *
* ** NOTE ** A word on the S_NETCONFIGS semaphore:
* This is a fairly high-level type of critical section. It ensures that no
* two threads work on the netconfigs files at the same time. Since we do
* ** NOTE ** A word on the S_NETCONFIGS semaphore:
* This is a fairly high-level type of critical section. It ensures that no
* two threads work on the netconfigs files at the same time. Since we do
@@
-81,20
+75,12
@@
#include "file_ops.h"
#include "citadel_dirs.h"
#include "threads.h"
#include "file_ops.h"
#include "citadel_dirs.h"
#include "threads.h"
-
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
-
#include "context.h"
#include "netconfig.h"
#include "netspool.h"
#include "netmail.h"
#include "ctdl_module.h"
#include "context.h"
#include "netconfig.h"
#include "netspool.h"
#include "netmail.h"
#include "ctdl_module.h"
-
-
-
int read_spoolcontrol_file(SpoolControl **scc, char *filename)
{
FILE *fp;
int read_spoolcontrol_file(SpoolControl **scc, char *filename)
{
FILE *fp;
diff --git
a/citadel/modules/network/serv_network.c
b/citadel/modules/network/serv_network.c
index 9c6fb5a7b73f62d88ba397ea049fcf53344d9027..578a8e17e4e90fa35e843820d761ed152e1a56a3 100644
(file)
--- a/
citadel/modules/network/serv_network.c
+++ b/
citadel/modules/network/serv_network.c
@@
-5,19
+5,13
@@
* Copyright (c) 2000-2012 by the citadel.org team
*
* This program is open source software; you can redistribute it and/or modify
* Copyright (c) 2000-2012 by the citadel.org team
*
* 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.
+ * it under the terms of the GNU General Public License, version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * 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
- *
* ** NOTE ** A word on the S_NETCONFIGS semaphore:
* This is a fairly high-level type of critical section. It ensures that no
* two threads work on the netconfigs files at the same time. Since we do
* ** NOTE ** A word on the S_NETCONFIGS semaphore:
* This is a fairly high-level type of critical section. It ensures that no
* two threads work on the netconfigs files at the same time. Since we do
@@
-81,11
+75,6
@@
#include "file_ops.h"
#include "citadel_dirs.h"
#include "threads.h"
#include "file_ops.h"
#include "citadel_dirs.h"
#include "threads.h"
-
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
-
#include "context.h"
#include "netconfig.h"
#include "netspool.h"
#include "context.h"
#include "netconfig.h"
#include "netspool.h"
diff --git
a/citadel/modules/network/serv_networkclient.c
b/citadel/modules/network/serv_networkclient.c
index 105b27ab9d70aab511878aecf1c9650796a48961..92ae1f78bec986f286ea3c3e14bf1fdd57f5bc19 100644
(file)
--- a/
citadel/modules/network/serv_networkclient.c
+++ b/
citadel/modules/network/serv_networkclient.c
@@
-5,19
+5,13
@@
* Copyright (c) 2000-2012 by the citadel.org team
*
* This program is open source software; you can redistribute it and/or modify
* Copyright (c) 2000-2012 by the citadel.org team
*
* 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.
+ * it under the terms of the GNU General Public License, version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * 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
- *
* ** NOTE ** A word on the S_NETCONFIGS semaphore:
* This is a fairly high-level type of critical section. It ensures that no
* two threads work on the netconfigs files at the same time. Since we do
* ** NOTE ** A word on the S_NETCONFIGS semaphore:
* This is a fairly high-level type of critical section. It ensures that no
* two threads work on the netconfigs files at the same time. Since we do
@@
-76,13
+70,7
@@
#include "file_ops.h"
#include "citadel_dirs.h"
#include "threads.h"
#include "file_ops.h"
#include "citadel_dirs.h"
#include "threads.h"
-
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
-
#include "context.h"
#include "context.h"
-
#include "netconfig.h"
#include "ctdl_module.h"
#include "netconfig.h"
#include "ctdl_module.h"
diff --git
a/citadel/modules/roomchat/serv_roomchat.c
b/citadel/modules/roomchat/serv_roomchat.c
index c153c4f11c192e4bbad0d189b136dc1633bda2ab..bc2f65c27a53f6213e4200771b375a2732037221 100644
(file)
--- a/
citadel/modules/roomchat/serv_roomchat.c
+++ b/
citadel/modules/roomchat/serv_roomchat.c
@@
-5,18
+5,11
@@
*
* This program is open source software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 3.
*
* This program is open source software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 3.
- *
- *
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
- *
- *
- *
- *
*/
#include "sysdep.h"
#include <stdlib.h>
*/
#include "sysdep.h"
#include <stdlib.h>
@@
-51,14
+44,8
@@
#include "config.h"
#include "msgbase.h"
#include "user_ops.h"
#include "config.h"
#include "msgbase.h"
#include "user_ops.h"
-
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
-
#include "ctdl_module.h"
#include "ctdl_module.h"
-
struct chatmsg {
struct chatmsg *next;
time_t timestamp;
struct chatmsg {
struct chatmsg *next;
time_t timestamp;
diff --git
a/citadel/modules/smtp/serv_smtp.c
b/citadel/modules/smtp/serv_smtp.c
index a4e7d75afb00d2a131631eeb304950a881a85071..ff81df7dee2071b840c7bf293fd1bc54275eaef4 100644
(file)
--- a/
citadel/modules/smtp/serv_smtp.c
+++ b/
citadel/modules/smtp/serv_smtp.c
@@
-77,14
+77,6
@@
#include "clientsocket.h"
#include "locate_host.h"
#include "citadel_dirs.h"
#include "clientsocket.h"
#include "locate_host.h"
#include "citadel_dirs.h"
-
-
-
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
-
-
#include "ctdl_module.h"
#include "smtp_util.h"
#include "ctdl_module.h"
#include "smtp_util.h"
diff --git
a/citadel/serv_extensions.c
b/citadel/serv_extensions.c
index 861ecb8497adee990ab428fb624c116f78b1c599..dee82748d13053bf27d62217b1fce1fc56a91649 100644
(file)
--- a/
citadel/serv_extensions.c
+++ b/
citadel/serv_extensions.c
@@
-35,10
+35,6
@@
#include "ctdl_module.h"
#include "ctdl_module.h"
-#ifndef HAVE_SNPRINTF
-#include <stdarg.h>
-#include "snprintf.h"
-#endif
int DebugModules = 0;
int DebugModules = 0;
diff --git
a/citadel/server_main.c
b/citadel/server_main.c
index 7c6a46434e8a51e7669f9029eff6d8a9dc701920..8f432963b42266b8108e2e365d75f15c2c832094 100644
(file)
--- a/
citadel/server_main.c
+++ b/
citadel/server_main.c
@@
-74,9
+74,6
@@
#include <sys/select.h>
#endif
#include <sys/select.h>
#endif
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
const char *CitadelServiceUDS="citadel-UDS";
const char *CitadelServiceTCP="citadel-TCP";
const char *CitadelServiceUDS="citadel-UDS";
const char *CitadelServiceTCP="citadel-TCP";
diff --git
a/citadel/sysdep.c
b/citadel/sysdep.c
index b59445a850996413b669ab93574c6b6990df29a0..6bdbac3e74c8402846a39331361abe962a118834 100644
(file)
--- a/
citadel/sysdep.c
+++ b/
citadel/sysdep.c
@@
-73,10
+73,6
@@
#include <sys/select.h>
#endif
#include <sys/select.h>
#endif
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
-
#include "ctdl_module.h"
#include "threads.h"
#include "user_ops.h"
#include "ctdl_module.h"
#include "threads.h"
#include "user_ops.h"
diff --git
a/citadel/utils/aidepost.c
b/citadel/utils/aidepost.c
index d4446a1ef54b18fcf40710fc4466a10920043dbf..43203a294a31f6724a69d8afeab311ea25f9fc98 100644
(file)
--- a/
citadel/utils/aidepost.c
+++ b/
citadel/utils/aidepost.c
@@
-22,11
+22,6
@@
#include "citadel.h"
#include "citadel_dirs.h"
#include "citadel.h"
#include "citadel_dirs.h"
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
-
-
/*
* Simplified function to generate a message in our format
*/
/*
* Simplified function to generate a message in our format
*/
diff --git
a/citadel/utils/citmail.c
b/citadel/utils/citmail.c
index a7a4c9006e69b6d083f673b929437ed8616aa090..becdb9abc870b5fdf5a0154d4832d0a2fe273c79 100644
(file)
--- a/
citadel/utils/citmail.c
+++ b/
citadel/utils/citmail.c
@@
-31,9
+31,6
@@
#include <limits.h>
#include <libcitadel.h>
#include "citadel.h"
#include <limits.h>
#include <libcitadel.h>
#include "citadel.h"
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
#include "citadel_dirs.h"
int serv_sock;
#include "citadel_dirs.h"
int serv_sock;
diff --git
a/webcit/sysdep.c
b/webcit/sysdep.c
index 5d81fe3d248b581420affe4fb8a5ad826f39c084..0c0ac90e21c6f46c17580b08823666cf2de16254 100644
(file)
--- a/
webcit/sysdep.c
+++ b/
webcit/sysdep.c
@@
-59,9
+59,6
@@
#include <sys/select.h>
#endif
#include <sys/select.h>
#endif
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
#include "webserver.h"
#include "modules_init.h"
#if HAVE_BACKTRACE
#include "webserver.h"
#include "modules_init.h"
#if HAVE_BACKTRACE
diff --git
a/webcit/webserver.c
b/webcit/webserver.c
index c618e540265750d82ffad7ba256358fc110221c4..99e4574035801954412276640f312dcd4cc39d2a 100644
(file)
--- a/
webcit/webserver.c
+++ b/
webcit/webserver.c
@@
-14,9
+14,6
@@
#include "webserver.h"
#include "modules_init.h"
#include "webserver.h"
#include "modules_init.h"
-#ifndef HAVE_SNPRINTF
-int vsnprintf(char *buf, size_t max, const char *fmt, va_list argp);
-#endif
extern int msock; /* master listening socket */
extern char static_icon_dir[PATH_MAX]; /* where should we find our mime icons */
extern int msock; /* master listening socket */
extern char static_icon_dir[PATH_MAX]; /* where should we find our mime icons */