From 56d69e5d8434e98835a2582c59b771ba69475431 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Wed, 1 Sep 2010 13:15:15 -0400 Subject: [PATCH] Began removing $Id$ tags. This will be an ongoing process. --- citadel/Makefile.in | 2 -- citadel/auth.c | 26 ++++++-------- citadel/auth.h | 1 - citadel/axdefs.h | 1 - citadel/bootstrap | 5 +-- citadel/citadel-slapd.conf | 2 -- citadel/citadel.h | 2 -- citadel/citadel.pam | 2 -- citadel/citadel.rc | 2 -- citadel/citadel_decls.h | 1 - citadel/citadel_ldap.h | 2 -- citadel/citserver.c | 6 ++-- citadel/citserver.h | 9 +---- citadel/clientsocket.c | 2 -- citadel/clientsocket.h | 2 -- citadel/config.c | 2 -- citadel/config.h | 2 -- citadel/configure.ac | 1 - citadel/context.c | 2 -- citadel/context.h | 1 - citadel/control.c | 6 ++-- citadel/control.h | 3 +- citadel/database.c | 2 -- citadel/database.h | 3 +- citadel/domain.c | 25 ++++++-------- citadel/domain.h | 25 ++++++-------- citadel/ecrash.c | 34 +++++++++---------- citadel/euidindex.c | 5 +-- citadel/euidindex.h | 4 --- citadel/file_ops.c | 5 +-- citadel/file_ops.h | 1 - citadel/genstamp.c | 4 --- citadel/genstamp.h | 4 --- citadel/getutline.c | 3 -- citadel/housekeeping.c | 3 -- citadel/housekeeping.h | 1 - citadel/ical_dezonify.c | 3 -- citadel/ical_dezonify.h | 3 -- citadel/imap_tools.h | 5 --- citadel/include/php_datadefinitions.h | 5 +-- citadel/include/undef_data.h | 5 +-- citadel/internet_addressing.c | 2 -- citadel/internet_addressing.h | 4 --- citadel/internetmail.h | 1 - citadel/ipcdef.h | 2 -- citadel/journaling.c | 3 -- citadel/journaling.h | 2 -- citadel/ldap.c | 2 -- citadel/locate_host.c | 3 -- citadel/locate_host.h | 1 - citadel/md5.h | 3 -- citadel/mkinstalldirs | 2 -- citadel/msgbase.c | 4 +-- citadel/msgbase.h | 1 - citadel/parsedate.h | 4 --- citadel/room_ops.c | 4 +-- citadel/room_ops.h | 1 - citadel/serv_extensions.c | 3 -- citadel/serv_extensions.h | 1 - citadel/serv_network.h | 3 -- citadel/serv_sieve.h | 3 -- citadel/serv_vcard.h | 3 -- citadel/server.h | 1 - citadel/server_main.c | 24 ++++++------- citadel/snprintf.c | 2 -- citadel/snprintf.h | 1 - citadel/support.c | 3 -- citadel/support.h | 1 - citadel/sysconfig.h | 2 -- citadel/sysdep.c | 2 -- citadel/sysdep_decls.h | 1 - citadel/threads.c | 18 +++++++--- citadel/threads.h | 1 - citadel/typesize.h | 1 - citadel/user_ops.c | 5 +-- citadel/user_ops.h | 1 - citadel/utillib/ipc_c_tcp.c | 3 -- libcitadel/conftools/mkinstalldirs | 4 +-- libcitadel/lib/html_to_ascii.c | 24 ++++++------- libcitadel/lib/json.c | 3 -- libcitadel/lib/vcard.c | 2 -- libcitadel/lib/wildfire.c | 4 --- libcitadel/tests/Makefile.in | 2 -- webcit/listsub.c | 2 -- webcit/static/instant_messenger.html | 3 +- webcit/static/styles/iconbaricns.css | 2 -- webcit/static/styles/iconbarpiconly.css | 4 +-- webcit/tests/Makefile.in | 2 -- webcit/tests/test_main.c | 5 +-- .../plugins/advhr/editor_plugin_src.js | 9 ++--- .../plugins/advimage/editor_plugin_src.js | 9 ++--- .../plugins/advlink/editor_plugin_src.js | 9 ++--- .../plugins/autosave/editor_plugin_src.js | 9 ++--- .../plugins/bbcode/editor_plugin_src.js | 9 ++--- .../plugins/compat2x/editor_plugin_src.js | 7 ++-- .../plugins/contextmenu/editor_plugin_src.js | 9 ++--- .../directionality/editor_plugin_src.js | 9 ++--- .../plugins/emotions/editor_plugin_src.js | 9 ++--- .../plugins/example/editor_plugin_src.js | 9 ++--- .../plugins/fullpage/editor_plugin_src.js | 9 ++--- .../plugins/fullscreen/editor_plugin_src.js | 9 ++--- .../plugins/iespell/editor_plugin_src.js | 9 ++--- .../plugins/inlinepopups/editor_plugin_src.js | 7 ++-- .../insertdatetime/editor_plugin_src.js | 9 ++--- .../plugins/layer/editor_plugin_src.js | 9 ++--- .../plugins/media/editor_plugin_src.js | 9 ++--- .../plugins/nonbreaking/editor_plugin_src.js | 9 ++--- .../plugins/noneditable/editor_plugin_src.js | 9 ++--- .../plugins/pagebreak/editor_plugin_src.js | 9 ++--- .../plugins/paste/editor_plugin_src.js | 9 ++--- .../plugins/preview/editor_plugin_src.js | 9 ++--- .../plugins/print/editor_plugin_src.js | 7 ++-- .../plugins/safari/editor_plugin_src.js | 7 ++-- 113 files changed, 172 insertions(+), 433 deletions(-) diff --git a/citadel/Makefile.in b/citadel/Makefile.in index 5c42a1032..89895dfa0 100644 --- a/citadel/Makefile.in +++ b/citadel/Makefile.in @@ -8,8 +8,6 @@ # 2. Send e-mail to ajc@uncensored.citadel.org and let me know what you # did, so any necessary changes can be put into the next release. # -# $Id$ -# ######################################################################## prefix=@prefix@ diff --git a/citadel/auth.c b/citadel/auth.c index d2061a8cb..f1062a84f 100644 --- a/citadel/auth.c +++ b/citadel/auth.c @@ -1,26 +1,23 @@ /* - * $Id$ - * * system-level password checking for host auth mode * by Nathan Bryant, March 1999 * updated by Trey van Riper, June 2005 * * Copyright (c) 1999-2009 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 - * (at your option) any later version. - * - * 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 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 + * (at your option) any later version. * - * 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 + * 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 */ #if defined(__linux) || defined(__sun) /* needed for crypt(): */ @@ -151,4 +148,3 @@ int validate_password(uid_t uid, const char *pass) return retval; } - diff --git a/citadel/auth.h b/citadel/auth.h index d80afb930..a0799aac2 100644 --- a/citadel/auth.h +++ b/citadel/auth.h @@ -1,2 +1 @@ -/* $Id$ */ int validate_password(uid_t uid, const char *pass); diff --git a/citadel/axdefs.h b/citadel/axdefs.h index 7baee1908..bb23fd9ae 100644 --- a/citadel/axdefs.h +++ b/citadel/axdefs.h @@ -1,4 +1,3 @@ -/* $Id$ */ #ifndef AXDEFS char *axdefs[]={ diff --git a/citadel/bootstrap b/citadel/bootstrap index 14ceb3d83..636a4b168 100755 --- a/citadel/bootstrap +++ b/citadel/bootstrap @@ -1,9 +1,6 @@ #!/bin/sh # -# run me after checking Citadel out of CVS. -# -# $Id$ -# +# run me after checking Citadel out of the source code repository. # Remove any vestiges of pre-6.05 build environments rm -f .libs modules *.so *.lo *.la 2>/dev/null diff --git a/citadel/citadel-slapd.conf b/citadel/citadel-slapd.conf index eb2fd8fcc..d4b3cf674 100644 --- a/citadel/citadel-slapd.conf +++ b/citadel/citadel-slapd.conf @@ -1,5 +1,3 @@ -# $Id$ -# # This is a sample OpenLDAP configuration file (usually placed in # /etc/openldap/slapd.conf) for use with the Citadel LDAP connector. # diff --git a/citadel/citadel.h b/citadel/citadel.h index d519766a7..abcd3c42c 100644 --- a/citadel/citadel.h +++ b/citadel/citadel.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Main Citadel header file * * Copyright (c) 1987-2010 by the citadel.org team diff --git a/citadel/citadel.pam b/citadel/citadel.pam index bc522f765..743c35a4b 100644 --- a/citadel/citadel.pam +++ b/citadel/citadel.pam @@ -2,8 +2,6 @@ # # /etc/pam.d/citadel: PAM configuration file for Linux-PAM. # -# $Id$ -# auth include system-auth account include system-auth session include system-auth diff --git a/citadel/citadel.rc b/citadel/citadel.rc index 4b67a1924..75284cac4 100644 --- a/citadel/citadel.rc +++ b/citadel/citadel.rc @@ -1,6 +1,4 @@ # -# $Id$ -# # This file allows full customization of the user interface. # # The standard client looks for this file in: diff --git a/citadel/citadel_decls.h b/citadel/citadel_decls.h index c5bbf2eb7..19895e626 100644 --- a/citadel/citadel_decls.h +++ b/citadel/citadel_decls.h @@ -1,4 +1,3 @@ -/* $Id$ */ extern char fullname[USERNAME_SIZE]; extern unsigned room_flags; extern char room_name[ROOMNAMELEN]; diff --git a/citadel/citadel_ldap.h b/citadel/citadel_ldap.h index e8c65a5d2..b401cc9f1 100644 --- a/citadel/citadel_ldap.h +++ b/citadel/citadel_ldap.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Configuration for LDAP authentication. Most of this stuff gets pulled out of our site config file. * * Copyright (c) 1987-2009 by the citadel.org team diff --git a/citadel/citserver.c b/citadel/citserver.c index 51916926c..48e4deae0 100644 --- a/citadel/citserver.c +++ b/citadel/citserver.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Main source module for the Citadel server * * Copyright (c) 1987-2010 by the citadel.org team @@ -1106,6 +1104,6 @@ CTDL_MODULE_INIT(citserver) CtdlRegisterProtoHook(cmd_scdn, "SCDN", "schedule or cancel a server shutdown"); CtdlRegisterProtoHook(cmd_time, "TIME", "fetch the date and time from the server"); } - /* return our Subversion id for the Log */ - return "$Id$"; + /* return our id for the Log */ + return "citserver"; } diff --git a/citadel/citserver.h b/citadel/citserver.h index 0e2308313..02815f595 100644 --- a/citadel/citserver.h +++ b/citadel/citserver.h @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * Copyright (c) 1987-2009 by the citadel.org team * * This program is free software; you can redistribute it and/or modify @@ -45,10 +44,4 @@ void GenerateRoomDisplay(char *real_room, CitContext *viewer); extern int panic_fd; char CtdlCheckExpress(void); - - - - - extern time_t server_startup_time; - diff --git a/citadel/clientsocket.c b/citadel/clientsocket.c index 5e232c98d..1f66a261b 100644 --- a/citadel/clientsocket.c +++ b/citadel/clientsocket.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * This module handles client-side sockets opened by the Citadel server (for * the client side of Internet protocols, etc.) It does _not_ handle client * sockets for the Citadel client; for that you must look in ipc_c_tcp.c diff --git a/citadel/clientsocket.h b/citadel/clientsocket.h index 794a6dbf3..55540098c 100644 --- a/citadel/clientsocket.h +++ b/citadel/clientsocket.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Header file for TCP client socket library * * Copyright (c) 1987-2009 by the citadel.org team diff --git a/citadel/config.c b/citadel/config.c index 9d731d3e7..6817e27fe 100644 --- a/citadel/config.c +++ b/citadel/config.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Read and write the citadel.config file * * Copyright (c) 1987-2009 by the citadel.org team diff --git a/citadel/config.h b/citadel/config.h index 967818c54..22a96b1d1 100644 --- a/citadel/config.h +++ b/citadel/config.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (c) 1987-2009 by the citadel.org team * * This program is free software; you can redistribute it and/or modify diff --git a/citadel/configure.ac b/citadel/configure.ac index bbf3ce77c..b4ec4a178 100644 --- a/citadel/configure.ac +++ b/citadel/configure.ac @@ -1,5 +1,4 @@ dnl Process this file with autoconf to produce a configure script. -dnl $Id$ AC_PREREQ(2.52) AC_INIT([Citadel], [7.83], [http://www.citadel.org/]) AC_REVISION([$Revision: 5108 $]) diff --git a/citadel/context.c b/citadel/context.c index fb4a5dd11..aa6033c80 100644 --- a/citadel/context.c +++ b/citadel/context.c @@ -1,6 +1,4 @@ /* - * $Id: sysdep.c 7989 2009-10-31 15:29:37Z davew $ - * * Citadel context management stuff. * Here's where we (hopefully) have all the code that manipulates contexts. * diff --git a/citadel/context.h b/citadel/context.h index 7a71d3b96..8fc79cfe0 100644 --- a/citadel/context.h +++ b/citadel/context.h @@ -1,4 +1,3 @@ -/* $Id: sysdep_decls.h 7265 2009-03-25 23:18:46Z dothebart $ */ #ifndef CONTEXT_H #define CONTEXT_H diff --git a/citadel/control.c b/citadel/control.c index 7048ab702..1779633fa 100644 --- a/citadel/control.c +++ b/citadel/control.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * This module handles states which are global to the entire server. * * Copyright (c) 1987-2010 by the citadel.org team @@ -726,6 +724,6 @@ CTDL_MODULE_INIT(control) if (!threading) { CtdlRegisterProtoHook(cmd_conf, "CONF", "get/set system configuration"); } - /* return our Subversion id for the Log */ - return "$Id$"; + /* return our id for the Log */ + return "control"; } diff --git a/citadel/control.h b/citadel/control.h index 5719a92dc..daaa5eeb0 100644 --- a/citadel/control.h +++ b/citadel/control.h @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * Copyright (c) 1987-2009 by the citadel.org team * * This program is free software; you can redistribute it and/or modify diff --git a/citadel/database.c b/citadel/database.c index 95b4f9a60..95c69476e 100644 --- a/citadel/database.c +++ b/citadel/database.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * This is a data store backend for the Citadel server which uses Berkeley DB. * * Copyright (c) 1987-2009 by the citadel.org team diff --git a/citadel/database.h b/citadel/database.h index 33f69154b..c87533d19 100644 --- a/citadel/database.h +++ b/citadel/database.h @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * Copyright (c) 1987-2009 by the citadel.org team * * This program is free software; you can redistribute it and/or modify diff --git a/citadel/domain.c b/citadel/domain.c index 4f723134b..0522c17fd 100644 --- a/citadel/domain.c +++ b/citadel/domain.c @@ -1,24 +1,21 @@ /* - * $Id$ - * * DNS lookup for SMTP sender * - * * Copyright (c) 1987-2009 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 - * (at your option) any later version. + * 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 + * (at your option) any later version. * - * 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 + * 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 */ #include "sysdep.h" diff --git a/citadel/domain.h b/citadel/domain.h index 646c23df1..664d61fd3 100644 --- a/citadel/domain.h +++ b/citadel/domain.h @@ -1,22 +1,19 @@ /* - * $Id$ - * - * * Copyright (c) 1987-2009 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 - * (at your option) any later version. + * 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 + * (at your option) any later version. * - * 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 + * 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 */ struct mx { diff --git a/citadel/ecrash.c b/citadel/ecrash.c index 9c4104129..f93742a71 100644 --- a/citadel/ecrash.c +++ b/citadel/ecrash.c @@ -1,31 +1,29 @@ /* - * $Id$ - * * author: David Frascone * - * eCrash Implementation + * eCrash Implementation * - * eCrash will allow you to capture stack traces in the - * event of a crash, and write those traces to disk, stdout, - * or any other file handle. + * eCrash will allow you to capture stack traces in the + * event of a crash, and write those traces to disk, stdout, + * or any other file handle. * - * modified to integrate closer into citadel by Wilfried Goesgens + * modified to integrate closer into citadel by Wilfried Goesgens * * vim: ts=4 * - * 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 - * (at your option) any later version. + * 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 + * (at your option) any later version. * - * 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 + * 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 */ #include "sysdep.h" diff --git a/citadel/euidindex.c b/citadel/euidindex.c index d45689ff7..842fa1d78 100644 --- a/citadel/euidindex.c +++ b/citadel/euidindex.c @@ -1,8 +1,5 @@ /* - * $Id$ - * * Index messages by EUID per room. - * */ #include "sysdep.h" @@ -262,5 +259,5 @@ CTDL_MODULE_INIT(euidindex) CtdlRegisterProtoHook(cmd_euid, "EUID", "Autoconverted. TODO: document me."); } /* return our Subversion id for the Log */ - return "$Id$"; + return "euidindex"; } diff --git a/citadel/euidindex.h b/citadel/euidindex.h index 3357b6792..8622c6ad7 100644 --- a/citadel/euidindex.h +++ b/citadel/euidindex.h @@ -1,8 +1,5 @@ /* - * $Id$ - * * Index messages by EUID per room. - * */ int DoesThisRoomNeedEuidIndexing(struct ctdlroom *qrbuf); @@ -11,4 +8,3 @@ long locate_message_by_euid(char *euid, struct ctdlroom *qrbuf) __attribute__ (( void index_message_by_euid(char *euid, struct ctdlroom *qrbuf, long msgnum); void rebuild_euid_index(void); void cmd_euid(char *cmdbuf); - diff --git a/citadel/file_ops.c b/citadel/file_ops.c index ada1a7814..2e7c4f707 100644 --- a/citadel/file_ops.c +++ b/citadel/file_ops.c @@ -1,8 +1,5 @@ /* - * $Id$ - * * Server functions which handle file transfers and room directories. - * */ #include "sysdep.h" @@ -829,5 +826,5 @@ CTDL_MODULE_INIT(file_ops) CtdlRegisterProtoHook(cmd_uimg, "UIMG", "Upload an image file"); } /* return our Subversion id for the Log */ - return "$Id$"; + return "file_ops"; } diff --git a/citadel/file_ops.h b/citadel/file_ops.h index 18751f1e6..125c5a6be 100644 --- a/citadel/file_ops.h +++ b/citadel/file_ops.h @@ -1,4 +1,3 @@ -/* $Id$ */ #ifndef FILE_OPS_H #define FILE_OPS_H diff --git a/citadel/genstamp.c b/citadel/genstamp.c index cbf89d448..eb594119a 100644 --- a/citadel/genstamp.c +++ b/citadel/genstamp.c @@ -1,8 +1,5 @@ /* - * $Id$ - * * Function to generate RFC822-compliant textual time/date stamp - * */ #include "sysdep.h" @@ -91,4 +88,3 @@ void datestring(char *buf, size_t n, time_t xtime, int which_format) { } } - diff --git a/citadel/genstamp.h b/citadel/genstamp.h index 58e32c78d..43208d910 100644 --- a/citadel/genstamp.h +++ b/citadel/genstamp.h @@ -1,7 +1,3 @@ -/* - * $Id$ - * - */ void datestring(char *buf, size_t n, time_t xtime, int which_format); diff --git a/citadel/getutline.c b/citadel/getutline.c index 5eae2a760..7c6b78e2f 100644 --- a/citadel/getutline.c +++ b/citadel/getutline.c @@ -1,9 +1,6 @@ /* - * $Id$ - * * getutline.c: not-quite-compatible replacement for getutline(3) * by nathan bryant, feb 1999 - * */ #include "sysdep.h" diff --git a/citadel/housekeeping.c b/citadel/housekeeping.c index 5d64012f6..0b2f2464d 100644 --- a/citadel/housekeeping.c +++ b/citadel/housekeeping.c @@ -1,8 +1,5 @@ /* - * $Id$ - * * This file contains miscellaneous housekeeping tasks. - * */ #include "sysdep.h" diff --git a/citadel/housekeeping.h b/citadel/housekeeping.h index 8e8affb8b..90ee12a2a 100644 --- a/citadel/housekeeping.h +++ b/citadel/housekeeping.h @@ -1,4 +1,3 @@ -/* $Id$ */ void check_sched_shutdown(void); void check_ref_counts(void); void do_housekeeping(void); diff --git a/citadel/ical_dezonify.c b/citadel/ical_dezonify.c index dc9c245af..8ec12f7e9 100644 --- a/citadel/ical_dezonify.c +++ b/citadel/ical_dezonify.c @@ -1,10 +1,7 @@ /* - * $Id$ - * * Function to go through an ical component set and convert all non-UTC * date/time properties to UTC. It also strips out any VTIMEZONE * subcomponents afterwards, because they're irrelevant. - * */ diff --git a/citadel/ical_dezonify.h b/citadel/ical_dezonify.h index b28b729c0..ccef82ba8 100644 --- a/citadel/ical_dezonify.h +++ b/citadel/ical_dezonify.h @@ -1,5 +1,2 @@ -/* - * $Id$ - */ void ical_dezonify(icalcomponent *cal); icaltimezone *get_default_icaltimezone(void); diff --git a/citadel/imap_tools.h b/citadel/imap_tools.h index 78e2f5afd..8c64aba24 100644 --- a/citadel/imap_tools.h +++ b/citadel/imap_tools.h @@ -1,8 +1,3 @@ -/* - * $Id$ - * - */ - /* * FDELIM defines which character we want to use as a folder delimiter * in room names. Originally we used a forward slash, but that caused diff --git a/citadel/include/php_datadefinitions.h b/citadel/include/php_datadefinitions.h index 276ed5c69..176757ea0 100644 --- a/citadel/include/php_datadefinitions.h +++ b/citadel/include/php_datadefinitions.h @@ -1,7 +1,4 @@ -/** - * - * $Id: $ - * +/* * this file contains the defines that convert our x-macros to datatypes */ diff --git a/citadel/include/undef_data.h b/citadel/include/undef_data.h index 791a9458b..07fec48da 100644 --- a/citadel/include/undef_data.h +++ b/citadel/include/undef_data.h @@ -1,7 +1,4 @@ -/** - * - * $Id: $ - * +/* * this file contains the defines that convert our x-macros to datatypes */ diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c index 5f19a9a56..0bb741a98 100644 --- a/citadel/internet_addressing.c +++ b/citadel/internet_addressing.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * This file contains functions which handle the mapping of Internet addresses * to users on the Citadel system. */ diff --git a/citadel/internet_addressing.h b/citadel/internet_addressing.h index 77486d061..244110955 100644 --- a/citadel/internet_addressing.h +++ b/citadel/internet_addressing.h @@ -1,7 +1,3 @@ -/* - * $Id$ - * - */ #include "server.h" diff --git a/citadel/internetmail.h b/citadel/internetmail.h index 71c1d80cb..00c565297 100644 --- a/citadel/internetmail.h +++ b/citadel/internetmail.h @@ -1,3 +1,2 @@ -/* $Id$ */ void LoadInternetConfig(void); int IsHostLocal(char *WhichHost); diff --git a/citadel/ipcdef.h b/citadel/ipcdef.h index d5dc44e84..a350069ba 100644 --- a/citadel/ipcdef.h +++ b/citadel/ipcdef.h @@ -1,5 +1,3 @@ -/* $Id$ */ - #ifdef __cplusplus extern "C" { #endif diff --git a/citadel/journaling.c b/citadel/journaling.c index 38201ff52..33b840732 100644 --- a/citadel/journaling.c +++ b/citadel/journaling.c @@ -1,8 +1,5 @@ /* - * $Id$ - * * Message journaling functions. - * */ #include "sysdep.h" diff --git a/citadel/journaling.h b/citadel/journaling.h index 017bc6a37..4a66781ae 100644 --- a/citadel/journaling.h +++ b/citadel/journaling.h @@ -1,5 +1,3 @@ -/* $Id$ */ - struct jnlq { struct jnlq *next; struct recptypes recps; diff --git a/citadel/ldap.c b/citadel/ldap.c index 196254546..75bbb976a 100644 --- a/citadel/ldap.c +++ b/citadel/ldap.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * These functions implement the portions of AUTHMODE_LDAP and AUTHMODE_LDAP_AD which * actually speak to the LDAP server. * diff --git a/citadel/locate_host.c b/citadel/locate_host.c index e3840570e..e1693d25c 100644 --- a/citadel/locate_host.c +++ b/citadel/locate_host.c @@ -1,8 +1,5 @@ /* - * $Id$ - * * Functions which handle hostname/address lookups and resolution - * */ #include "sysdep.h" diff --git a/citadel/locate_host.h b/citadel/locate_host.h index 21ae5bdfd..10039b996 100644 --- a/citadel/locate_host.h +++ b/citadel/locate_host.h @@ -1,4 +1,3 @@ -/* $Id$ */ void locate_host(char *tbuf, size_t n, char *abuf, size_t na, int client_socket); int rbl_check(char *message_to_spammer); int hostname_to_dotted_quad(char *addr, char *host); diff --git a/citadel/md5.h b/citadel/md5.h index 6af369084..8fc29223c 100644 --- a/citadel/md5.h +++ b/citadel/md5.h @@ -1,6 +1,3 @@ -/* - * $Id$ - */ #ifndef MD5_H #define MD5_H diff --git a/citadel/mkinstalldirs b/citadel/mkinstalldirs index d0fd194fd..f945dbf2b 100755 --- a/citadel/mkinstalldirs +++ b/citadel/mkinstalldirs @@ -4,8 +4,6 @@ # Created: 1993-05-16 # Public domain -# $Id$ - errstatus=0 for file diff --git a/citadel/msgbase.c b/citadel/msgbase.c index 5178f2c51..2af2d3952 100644 --- a/citadel/msgbase.c +++ b/citadel/msgbase.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Implements the message store. * * Copyright (c) 1987-2010 by the citadel.org team @@ -4943,5 +4941,5 @@ CTDL_MODULE_INIT(msgbase) } /* return our Subversion id for the Log */ - return "$Id$"; + return "msgbase"; } diff --git a/citadel/msgbase.h b/citadel/msgbase.h index 0917f1978..5bbd7aef6 100644 --- a/citadel/msgbase.h +++ b/citadel/msgbase.h @@ -1,4 +1,3 @@ -/* $Id$ */ #ifndef MSGBASE_H #define MSGBASE_H diff --git a/citadel/parsedate.h b/citadel/parsedate.h index b28dae0eb..55b7bc5ce 100644 --- a/citadel/parsedate.h +++ b/citadel/parsedate.h @@ -1,6 +1,2 @@ -/* - * $Id$ - * - */ time_t parsedate(char *); diff --git a/citadel/room_ops.c b/citadel/room_ops.c index 25d335220..83d68a347 100644 --- a/citadel/room_ops.c +++ b/citadel/room_ops.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Server functions which perform operations on room objects. * */ @@ -2264,5 +2262,5 @@ CTDL_MODULE_INIT(room_ops) CtdlRegisterProtoHook(cmd_eflr, "EFLR", "Autoconverted. TODO: document me."); } /* return our Subversion id for the Log */ - return "$Id$"; + return "room_ops"; } diff --git a/citadel/room_ops.h b/citadel/room_ops.h index 880ff8219..f4c7cf527 100644 --- a/citadel/room_ops.h +++ b/citadel/room_ops.h @@ -1,4 +1,3 @@ -/* $Id$ */ int is_known (struct ctdlroom *roombuf, int roomnum, struct ctdluser *userbuf); int has_newmsgs (struct ctdlroom *roombuf, int roomnum, diff --git a/citadel/serv_extensions.c b/citadel/serv_extensions.c index c74dcb6d3..5417d2672 100644 --- a/citadel/serv_extensions.c +++ b/citadel/serv_extensions.c @@ -1,9 +1,6 @@ /* - * $Id$ - * * Citadel Dynamic Loading Module * Written by Brian Costello - * */ #include "sysdep.h" diff --git a/citadel/serv_extensions.h b/citadel/serv_extensions.h index a34526bad..6cca652aa 100644 --- a/citadel/serv_extensions.h +++ b/citadel/serv_extensions.h @@ -1,4 +1,3 @@ -/* $Id$ */ #ifndef SERV_EXTENSIONS_H #define SERV_EXTENSIONS_H diff --git a/citadel/serv_network.h b/citadel/serv_network.h index ba6232cc8..6f05431e8 100644 --- a/citadel/serv_network.h +++ b/citadel/serv_network.h @@ -1,6 +1,3 @@ -/* - * $Id$ - */ typedef struct namelist namelist; diff --git a/citadel/serv_sieve.h b/citadel/serv_sieve.h index 516b83420..2a203cda7 100644 --- a/citadel/serv_sieve.h +++ b/citadel/serv_sieve.h @@ -1,6 +1,3 @@ -/* - * $Id$ - */ #include diff --git a/citadel/serv_vcard.h b/citadel/serv_vcard.h index 003b8d3d7..5e4b68fce 100644 --- a/citadel/serv_vcard.h +++ b/citadel/serv_vcard.h @@ -1,6 +1,3 @@ -/* - * $Id$ - */ void extract_inet_email_addrs(char *, size_t, char *, size_t, struct vCard *v, int local_addrs_only); struct vCard *vcard_get_user(struct ctdluser *u); diff --git a/citadel/server.h b/citadel/server.h index f894719b2..70770a15a 100644 --- a/citadel/server.h +++ b/citadel/server.h @@ -1,4 +1,3 @@ -/* $Id$ */ #ifndef SERVER_H diff --git a/citadel/server_main.c b/citadel/server_main.c index b44cd0996..d4558f86d 100644 --- a/citadel/server_main.c +++ b/citadel/server_main.c @@ -1,23 +1,21 @@ /* - * $Id$ - * * citserver's main() function lives here. * * Copyright (c) 1987-2010 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 - * (at your option) any later version. + * 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 + * (at your option) any later version. * - * 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 + * 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 */ #include "sysdep.h" diff --git a/citadel/snprintf.c b/citadel/snprintf.c index dcc9cd81c..ad04a02e2 100644 --- a/citadel/snprintf.c +++ b/citadel/snprintf.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Replacements for snprintf() and vsnprintf() * * modified from Sten Gunterberg's BUGTRAQ post of 22 Jul 1997 diff --git a/citadel/snprintf.h b/citadel/snprintf.h index 13c7c8e32..9cabca4e5 100644 --- a/citadel/snprintf.h +++ b/citadel/snprintf.h @@ -1,4 +1,3 @@ -/* $Id$ */ #ifndef __DECC #ifdef __GNUC__ diff --git a/citadel/support.c b/citadel/support.c index b650c7ee8..d3ffa929e 100644 --- a/citadel/support.c +++ b/citadel/support.c @@ -1,8 +1,5 @@ /* - * $Id$ - * * Server-side utility functions - * */ #include "sysdep.h" diff --git a/citadel/support.h b/citadel/support.h index 0b4aa3dce..0cfea7aac 100644 --- a/citadel/support.h +++ b/citadel/support.h @@ -1,4 +1,3 @@ -/* $Id$ */ void strproc (char *string); int getstring (FILE *fp, char *string); void mesg_locate (char *targ, size_t n, const char *searchfor, diff --git a/citadel/sysconfig.h b/citadel/sysconfig.h index 5ff5afb9b..97ecc1dff 100644 --- a/citadel/sysconfig.h +++ b/citadel/sysconfig.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * NOTE: this file is for client software tuning, not customization. For * making changes to the behavior of the client, you want to edit citadel.rc, * not this file. diff --git a/citadel/sysdep.c b/citadel/sysdep.c index f4a860e2c..09b66f286 100644 --- a/citadel/sysdep.c +++ b/citadel/sysdep.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Citadel "system dependent" stuff. * See COPYING for copyright information. * diff --git a/citadel/sysdep_decls.h b/citadel/sysdep_decls.h index 1a80dee2f..a95afedf2 100644 --- a/citadel/sysdep_decls.h +++ b/citadel/sysdep_decls.h @@ -1,4 +1,3 @@ -/* $Id$ */ #ifndef SYSDEP_DECLS_H #define SYSDEP_DECLS_H diff --git a/citadel/threads.c b/citadel/threads.c index b3f13a02e..96d3e4c04 100644 --- a/citadel/threads.c +++ b/citadel/threads.c @@ -1,11 +1,21 @@ /* - * $Id$ + * Thread handling stuff for Citadel server * - * Citadel "system dependent" stuff. - * See COPYING for copyright information. + * Copyright (c) 1987-2010 by the citadel.org team * - * Here's where we have the Citadel thread implimentation + * 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 + * (at your option) any later version. * + * 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 */ #include diff --git a/citadel/threads.h b/citadel/threads.h index 4103466f5..f6fa812bf 100644 --- a/citadel/threads.h +++ b/citadel/threads.h @@ -1,4 +1,3 @@ -/* $Id$ */ #ifndef THREADS_H #define THREADS_H diff --git a/citadel/typesize.h b/citadel/typesize.h index 57593307c..3732c3966 100644 --- a/citadel/typesize.h +++ b/citadel/typesize.h @@ -1,4 +1,3 @@ -/* $Id$ */ /* This file defines typedefs for 8, 16, and 32 bit integers. They are: diff --git a/citadel/user_ops.c b/citadel/user_ops.c index ed7268587..8b833a3cd 100644 --- a/citadel/user_ops.c +++ b/citadel/user_ops.c @@ -1,8 +1,5 @@ /* - * $Id$ - * * Server functions which perform operations on user objects. - * */ #include "sysdep.h" @@ -2090,5 +2087,5 @@ CTDL_MODULE_INIT(user_ops) CtdlRegisterProtoHook(cmd_newu, "NEWU", "Autoconverted. TODO: document me."); } /* return our Subversion id for the Log */ - return "$Id$"; + return "user_ops"; } diff --git a/citadel/user_ops.h b/citadel/user_ops.h index 1dcc07974..90c7ea8c2 100644 --- a/citadel/user_ops.h +++ b/citadel/user_ops.h @@ -2,7 +2,6 @@ #define __USER_OPS_H__ #include -/* $Id$ */ int hash (char *str); /* getuser is deprecated, use CtdlGetUser instead */ int getuser (struct ctdluser *, char *) __attribute__ ((deprecated)); diff --git a/citadel/utillib/ipc_c_tcp.c b/citadel/utillib/ipc_c_tcp.c index 811aa876b..a6cae96c7 100644 --- a/citadel/utillib/ipc_c_tcp.c +++ b/citadel/utillib/ipc_c_tcp.c @@ -1,8 +1,5 @@ /* - * $Id: ipc_c_tcp.c -1 $ - * * Client-side IPC functions - * */ diff --git a/libcitadel/conftools/mkinstalldirs b/libcitadel/conftools/mkinstalldirs index c5291db03..1e0d7c99c 100755 --- a/libcitadel/conftools/mkinstalldirs +++ b/libcitadel/conftools/mkinstalldirs @@ -1,11 +1,9 @@ -#! /bin/sh +#!/bin/sh # mkinstalldirs --- make directory hierarchy # Author: Noah Friedman # Created: 1993-05-16 # Public domain -# $Id: mkinstalldirs,v 1.1 2000/09/18 16:26:21 coopercc Exp $ - errstatus=0 for file diff --git a/libcitadel/lib/html_to_ascii.c b/libcitadel/lib/html_to_ascii.c index 86cbdedee..ccf074a48 100644 --- a/libcitadel/lib/html_to_ascii.c +++ b/libcitadel/lib/html_to_ascii.c @@ -1,22 +1,20 @@ /* - * $Id: html.c 6014 2008-02-04 18:38:35Z ajc $ - * * Functions which handle translation between HTML and plain text * Copyright (c) 2000-2010 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 - * (at your option) any later version. + * 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 + * (at your option) any later version. * - * 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 + * 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 */ #include diff --git a/libcitadel/lib/json.c b/libcitadel/lib/json.c index 9c941bc62..4e045da3e 100644 --- a/libcitadel/lib/json.c +++ b/libcitadel/lib/json.c @@ -1,6 +1,3 @@ -/* - * $Id: wildfire.c 6962 2009-01-18 19:33:45Z dothebart $ - */ /** * \defgroup Subst Variable substitution type stuff * \ingroup CitadelConfig diff --git a/libcitadel/lib/vcard.c b/libcitadel/lib/vcard.c index 8acef1058..5223da6b7 100644 --- a/libcitadel/lib/vcard.c +++ b/libcitadel/lib/vcard.c @@ -1,6 +1,4 @@ /* - * $Id: vcard.c 5754 2007-11-16 05:52:26Z ajc $ - * * vCard implementation for Citadel * * Copyright (C) 1999-2008 by the citadel.org development team. diff --git a/libcitadel/lib/wildfire.c b/libcitadel/lib/wildfire.c index babdd86f3..623c3b7c2 100644 --- a/libcitadel/lib/wildfire.c +++ b/libcitadel/lib/wildfire.c @@ -1,7 +1,3 @@ -/* - * $Id: wildfire.c 6962 2009-01-18 19:33:45Z dothebart $ - */ - /*@{*/ #include "sysdep.h" diff --git a/libcitadel/tests/Makefile.in b/libcitadel/tests/Makefile.in index db30bcad5..8ffea74e4 100644 --- a/libcitadel/tests/Makefile.in +++ b/libcitadel/tests/Makefile.in @@ -1,5 +1,3 @@ -# $Id: Makefile.in 7752 2009-08-29 10:37:43Z dothebart $ - AUTOCONF=@AUTOCONF@ CC=@CC@ CFLAGS=@CFLAGS@ diff --git a/webcit/listsub.c b/webcit/listsub.c index 1a6b992e4..60b5a49a6 100644 --- a/webcit/listsub.c +++ b/webcit/listsub.c @@ -1,6 +1,4 @@ /* - * $Id: listsub.c 8232 2010-01-14 21:46:39Z dothebart $ - * * Web forms for handling mailing list subscribe/unsubscribe requests. */ diff --git a/webcit/static/instant_messenger.html b/webcit/static/instant_messenger.html index 3526613ef..eb8add9f2 100644 --- a/webcit/static/instant_messenger.html +++ b/webcit/static/instant_messenger.html @@ -16,8 +16,7 @@