Assert that eMessageText MUST be serialized last.

[citadel.git] / citadel / server / server.h

diff --git a/citadel/server/server.h b/citadel/server/server.h
index b16289bf6baaf6d49d39cd428e7fa836b2a3ef80..8d1f7d0ff3bbf99c93e9bfa5895d407dc53e286b 100644 (file)
--- a/citadel/server/server.h
+++ b/citadel/server/server.h
@@ -1,6 +1,6 @@
 // Data types for the Citadel Server
 //
-// Copyright (c) 1987-2023 by the citadel.org team
+// Copyright (c) 1987-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.
@@ -70,7 +70,13 @@ struct ExpressMessage {
 struct cdbdata {
        size_t len;                     // size of datum pointed to by ptr
        char *ptr;                      // datum
-       int cdbfree_must_free_ptr;      // nonzero if cdb_free() is expected to free(ptr)
+};
+
+
+// Row being fetched from the database, both key and value are returned
+struct cdbkeyval {
+       struct cdbdata key;             // size and pointer to key
+       struct cdbdata val;             // size and pointer to value
 };
 
 
@@ -121,13 +127,6 @@ struct arcq {
 };
 
 
-// Serialization routines use this struct to return a pointer and a length
-struct ser_ret {
-       size_t len;
-       unsigned char *ser;
-};
-
-
 // The S_USETABLE database is used in several modules now, so we define its format here.
 struct UseTable {
        int hash;