Still waiting for the computer. Or rather, for other computers.

diff --git a/citadel/server/modules/imap/imap_acl.h b/citadel/server/modules/imap/imap_acl.h
index a3b260513b05a445a1659b2ddd275e551aad08de..c8a90977d19858629dad67f6d24510d251eb9989 100644 (file)
--- a/citadel/server/modules/imap/imap_acl.h
+++ b/citadel/server/modules/imap/imap_acl.h
@@ -1,14 +1,7 @@
-/*
- * Copyright (c) 2007-2017 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 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.
- */
+// Copyright (c) 2007-2024 by the citadel.org team
+//
+// This program is open source software.  Use, duplication, or disclosure
+// are subject to the terms of the GNU General Public License version 3.
 
 void imap_setacl(int num_parms, ConstStr *Params);
 void imap_deleteacl(int num_parms, ConstStr *Params);

diff --git a/citadel/server/modules/imap/imap_fetch.h b/citadel/server/modules/imap/imap_fetch.h
index 7847fce534c1f55d7407776a6b6bac519bfe0741..c65be34435adc596eda7e4a24a6ff748198c18c3 100644 (file)
--- a/citadel/server/modules/imap/imap_fetch.h
+++ b/citadel/server/modules/imap/imap_fetch.h
@@ -1,14 +1,7 @@
-/*
- * Copyright (c) 2001-2017 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 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.
- */
+// Copyright (c) 2001-2024 by the citadel.org team
+//
+// This program is open source software.  Use, duplication, or disclosure
+// are subject to the terms of the GNU General Public License version 3.
 
 void imap_pick_range(const char *range, int is_uid);
 void imap_fetch(int num_parms, ConstStr *Params);

diff --git a/citadel/server/modules/imap/imap_list.h b/citadel/server/modules/imap/imap_list.h
index 902c6d1c27785cc34fa971b97a688775dd691048..59247ca42862ea388e36cace4afc683cafd1b661 100644 (file)
--- a/citadel/server/modules/imap/imap_list.h
+++ b/citadel/server/modules/imap/imap_list.h
@@ -1,8 +1,5 @@
-
-/*
- * In the extended form of LIST the client is allowed to specify
- * multiple match patterns.  How many will we allow?
- */
+// In the extended form of LIST the client is allowed to specify
+// multiple match patterns.  How many will we allow?
 #define MAX_PATTERNS 20
 
 void imap_list(int num_parms, ConstStr *Params);

diff --git a/citadel/server/modules/imap/imap_metadata.h b/citadel/server/modules/imap/imap_metadata.h
index 3f2a8bcbde6b64d1313a44ae06dde63fa657176b..585c9f7eb3c4f045ecc1bec6724f19e6e5a6e10c 100644 (file)
--- a/citadel/server/modules/imap/imap_metadata.h
+++ b/citadel/server/modules/imap/imap_metadata.h
@@ -1,14 +1,7 @@
-/*
- * Copyright (c) 2007-2017 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 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.
- */
+// Copyright (c) 2007-2024 by the citadel.org team
+//
+// This program is open source software.  Use, duplication, or disclosure
+// are subject to the terms of the GNU General Public License version 3.
 
 void imap_getmetadata(int num_parms, ConstStr *Params);
 void imap_setmetadata(int num_parms, ConstStr *Params);

diff --git a/citadel/server/modules/imap/imap_misc.h b/citadel/server/modules/imap/imap_misc.h
index d0dfa40b9b392bc20fcf19df1399685161f4ffac..dec7b4dcc80bf81cabc0d81bc8bbeaeaa114ab2f 100644 (file)
--- a/citadel/server/modules/imap/imap_misc.h
+++ b/citadel/server/modules/imap/imap_misc.h
@@ -1,14 +1,7 @@
-/*
- * Copyright (c) 2001-2017 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 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.
- */
+// Copyright (c) 2001-2024 by the citadel.org team
+//
+// This program is open source software.  Use, duplication, or disclosure
+// is subject to the terms of the GNU General Public License version 3.
 
 void imap_copy(int num_parms, ConstStr *Params);
 void imap_uidcopy(int num_parms, ConstStr *Params);

diff --git a/citadel/server/modules/imap/imap_search.h b/citadel/server/modules/imap/imap_search.h
index ce2f27cea888eee77dd3cedd92cc058ead368f08..fa810c4fc133e234558aa5a6d8ff2b06e3247786 100644 (file)
--- a/citadel/server/modules/imap/imap_search.h
+++ b/citadel/server/modules/imap/imap_search.h
@@ -1,14 +1,7 @@
-/*
- * Copyright (c) 2001-2017 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 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.
- */
+// Copyright (c) 2001-2024 by the citadel.org team
+//
+// This program is open source software.  Use, duplication, or disclosure
+// is subject to the terms of the GNU General Public License version 3.
 
 void imap_search(int num_parms, ConstStr *Params);
 void imap_uidsearch(int num_parms, ConstStr *Params);

diff --git a/citadel/server/modules/imap/imap_store.h b/citadel/server/modules/imap/imap_store.h
index cf47377aaf4c04016e0afe552f669b428a21de10..8e090b2640332e28304f5393abf76552cb013dc2 100644 (file)
--- a/citadel/server/modules/imap/imap_store.h
+++ b/citadel/server/modules/imap/imap_store.h
@@ -1,14 +1,7 @@
-/*
- * Copyright (c) 2001-2017 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 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.
- */
+// Copyright (c) 2001-2024 by the citadel.org team
+//
+// This program is open source software.  Use, duplication, or disclosure
+// is subject to the terms of the GNU General Public License version 3.
 
 void imap_store(int num_parms, ConstStr *Params);
 void imap_uidstore(int num_parms, ConstStr *Params);

diff --git a/citadel/server/modules/imap/imap_tools.h b/citadel/server/modules/imap/imap_tools.h
index 2117a6ef4006d2763308122b95025d06c79d6cb0..2c7143a531bf81b7659cc35f393d25131ee5401e 100644 (file)
--- a/citadel/server/modules/imap/imap_tools.h
+++ b/citadel/server/modules/imap/imap_tools.h
@@ -1,25 +1,16 @@
 
-/* 
- * since we work with shifted pointers to ConstStrs in some places, 
- * we can't just say we want to cut the n'th of Cmd, we have to pass it in
- * and rely on that CutMe references Cmd->CmdBuf; else peek won't work out
- * and len will differ.
- */
-void TokenCutRight(citimap_command *Cmd, 
-                  ConstStr *CutMe,
-                  int n);
-/*
- * since we just move Key around here, Cmd is just here so the syntax is identical.
- */
-void TokenCutLeft(citimap_command *Cmd, 
-                 ConstStr *CutMe,
-                 int n);
-void MakeStringOf(StrBuf *Buf, int skip);
+// since we work with shifted pointers to ConstStrs in some places, 
+// we can't just say we want to cut the n'th of Cmd, we have to pass it in
+// and rely on that CutMe references Cmd->CmdBuf; else peek won't work out
+// and len will differ.
+void TokenCutRight(citimap_command *Cmd, ConstStr *CutMe, int n);
+
+// since we just move Key around here, Cmd is just here so the syntax is identical.
+void TokenCutLeft(citimap_command *Cmd, ConstStr *CutMe, int n);
 
-int CmdAdjust(citimap_command *Cmd, 
-             int nArgs,
-             int Realloc);
+void MakeStringOf(StrBuf *Buf, int skip);
 
+int CmdAdjust(citimap_command *Cmd, int nArgs, int Realloc);
 
 void imap_strout(ConstStr *args);
 void imap_strbuffer(StrBuf *Reply, ConstStr *args);
@@ -31,23 +22,22 @@ int imap_is_message_set(const char *);
 int imap_mailbox_matches_pattern(const char *pattern, char *mailboxname);
 int imap_datecmp(const char *datestr, time_t msgtime);
 
-
-/* Imap Append Printf, send to the outbuffer */
+// Imap Append Printf, send to the outbuffer
 void IAPrintf(const char *Format, ...) __attribute__((__format__(__printf__,1,2)));
 
 void iaputs(const char *Str, long Len);
 #define IAPuts(Msg) iaputs(HKEY(Msg))
-/* give it a naughty name since its ugly. */
+// give it a naughty name since its ugly.
 #define _iaputs(Msg) iaputs(Msg, strlen(Msg))
 
-/* outputs a static message prepended by the sequence no */
+// outputs a static message prepended by the sequence no
 void ireply(const char *Msg, long len);
 #define IReply(msg) ireply(HKEY(msg))
-/* outputs a dynamic message prepended by the sequence no */
+// outputs a dynamic message prepended by the sequence no
 void IReplyPrintf(const char *Format, ...);
 
 
-/* output a string like that {%ld}%s */
+// output a string like that {%ld}%s
 void IPutStr(const char *Msg, long Len);
 #define IPutCStr(_ConstStr) IPutStr(CKEY(_ConstStr))
 #define IPutCParamStr(n) IPutStr(CKEY(Params[n]))