Remove preprocessor tests for OpenSSL. It's a requirement.

[citadel.git] / libcitadel / lib / vnote.c

diff --git a/libcitadel/lib/vnote.c b/libcitadel/lib/vnote.c
index 7f50026776d1670342d8925cbc8d3fab20d1acab..59b95208fd6624969826ea918d466d18865537a1 100644 (file)
--- a/libcitadel/lib/vnote.c
+++ b/libcitadel/lib/vnote.c
@@ -1,11 +1,9 @@
-/*
- * vNote implementation for Citadel
- *
- * Copyright (C) 1999-2007 by the citadel.org development team.
- *
+// vNote implementation for Citadel
+//
+// Copyright (C) 1999-2023 by the citadel.org development team.
+//
 // This program is open source software.  Use, duplication, or disclosure
 // is subject to the terms of the GNU General Public License, version 3.
- */
 
 
 #include <stdlib.h>
@@ -13,18 +11,7 @@
 #include <stdio.h>
 #include <fcntl.h>
 #include <signal.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
+#include <time.h>
 #include <ctype.h>
 #include <string.h>
 #include <errno.h>
@@ -160,10 +147,9 @@ struct vnote *vnote_new_from_str(char *s) {
                                        free(decoded_value);    // throw it away
                                }
 
-                               /* FIXME still need to handle these:
-                                * X-OUTLOOK-CREATE-TIME:20070611T204615Z
-                                * REV:20070611T204621Z
-                                */
+                               // FIXME still need to handle these:
+                               // X-OUTLOOK-CREATE-TIME:20070611T204615Z
+                               // REV:20070611T204621Z
                        }
                        free(thisline);
                }
@@ -185,7 +171,7 @@ void vnote_free(struct vnote *v) {
 }
 
 
-/* helper function for vnote_serialize() */
+// helper function for vnote_serialize()
 void vnote_serialize_output_field(char *append_to, char *field, char *label) {
 
        char *mydup;
@@ -253,8 +239,7 @@ char *vnote_serialize(struct vnote *v) {
        vnote_serialize_output_field(s, v->summary, "SUMMARY");
        vnote_serialize_output_field(s, v->body, "BODY");
        vnote_serialize_output_field(s, v->body, "NOTE");
-       sprintf(&s[strlen(s)], "X-OUTLOOK-COLOR:#%02X%02X%02X\r\n",
-               v->color_red, v->color_green, v->color_blue);
+       sprintf(&s[strlen(s)], "X-OUTLOOK-COLOR:#%02X%02X%02X\r\n", v->color_red, v->color_green, v->color_blue);
        sprintf(&s[strlen(s)], "X-OUTLOOK-LEFT:%d\r\n", v->pos_left);
        sprintf(&s[strlen(s)], "X-OUTLOOK-TOP:%d\r\n", v->pos_top);
        sprintf(&s[strlen(s)], "X-OUTLOOK-WIDTH:%d\r\n", v->pos_width);