Begin removing the decimal point from our version number (901 instead of 9.01)

diff --git a/citadel/config.c b/citadel/config.c
index a993a63ee1cb52ee5a64aceba5ae57a334b87fcc..eadd6cb2fd990e9b9d840e040647fb689be5dfef 100644 (file)
--- a/citadel/config.c
+++ b/citadel/config.c
@@ -239,12 +239,8 @@ void initialize_config_system(void) {
 
        /* Ensure that we are linked to the correct version of libcitadel */
        if (libcitadel_version_number() < LIBCITADEL_VERSION_NUMBER) {
-               fprintf(stderr, "You are running libcitadel version %d.%02d\n",
-                       (libcitadel_version_number() / 100), (libcitadel_version_number() % 100)
-               );
-               fprintf(stderr, "citserver was compiled against version %d.%02d\n",
-                       (LIBCITADEL_VERSION_NUMBER / 100), (LIBCITADEL_VERSION_NUMBER % 100)
-               );
+               fprintf(stderr, "You are running libcitadel version %d\n", libcitadel_version_number());
+               fprintf(stderr, "citserver was compiled against version %d\n", LIBCITADEL_VERSION_NUMBER);
                exit(CTDLEXIT_LIBCITADEL);
        }
 

diff --git a/citadel/modules/nntp/serv_nntp.c b/citadel/modules/nntp/serv_nntp.c
index dee22bdfc4fedc72808d3be289d995fb8e7c2b6f..9e77f8dae5c7b6ccaa01fed9312f03297355913d 100644 (file)
--- a/citadel/modules/nntp/serv_nntp.c
+++ b/citadel/modules/nntp/serv_nntp.c
@@ -238,7 +238,7 @@ void nntp_starttls(void)
 void nntp_capabilities(void)
 {
        cprintf("101 Capability list:\r\n");
-       cprintf("IMPLEMENTATION Citadel v%d.%02d\r\n", (REV_LEVEL/100), (REV_LEVEL%100));
+       cprintf("IMPLEMENTATION Citadel %d\r\n", REV_LEVEL);
        cprintf("VERSION 2\r\n");
        cprintf("READER\r\n");
        cprintf("MODE-READER\r\n");

diff --git a/citadel/modules/upgrade/serv_upgrade.c b/citadel/modules/upgrade/serv_upgrade.c
index 53f737b676d0b6fbf8c3277303747d23de17deb1..249c825053524575e3bf5b990a442bf9d88fc111 100644 (file)
--- a/citadel/modules/upgrade/serv_upgrade.c
+++ b/citadel/modules/upgrade/serv_upgrade.c
@@ -1,7 +1,7 @@
 /*
  * Transparently handle the upgrading of server data formats.
  *
- * Copyright (c) 1987-2015 by the citadel.org team
+ * Copyright (c) 1987-2016 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.
@@ -256,10 +256,7 @@ void update_config(void) {
  */
 void check_server_upgrades(void) {
 
-       syslog(LOG_INFO, "Existing database version on disk is %d.%02d",
-               (CtdlGetConfigInt("MM_hosted_upgrade_level") / 100),
-               (CtdlGetConfigInt("MM_hosted_upgrade_level") % 100)
-       );
+       syslog(LOG_INFO, "Existing database version on disk is %d", CtdlGetConfigInt("MM_hosted_upgrade_level"));
 
        if (CtdlGetConfigInt("MM_hosted_upgrade_level") < REV_LEVEL) {
                syslog(LOG_WARNING,

diff --git a/citadel/server_main.c b/citadel/server_main.c
index 443fdd3bb4db68a9633072b910f8a098320ba352..45312588ee614e90f17c836fd2b05e95f7c5578c 100644 (file)
--- a/citadel/server_main.c
+++ b/citadel/server_main.c
@@ -195,9 +195,8 @@ int main(int argc, char **argv)
        /* Tell 'em who's in da house */
        syslog(LOG_NOTICE, " ");
        syslog(LOG_NOTICE, " ");
-       syslog(LOG_NOTICE,
-               "*** Citadel server engine v%d.%02d (build %s) ***",
-               (REV_LEVEL/100), (REV_LEVEL%100), svn_revision());
+       syslog(LOG_NOTICE, "*** Citadel server engine ***\n");
+       syslog(LOG_NOTICE, "Version %d (build %s) ***", REV_LEVEL, svn_revision());
        syslog(LOG_NOTICE, "Copyright (C) 1987-2016 by the Citadel development team.");
        syslog(LOG_NOTICE, "This program is distributed under the terms of the GNU "
                                        "General Public License.");

diff --git a/citadel/utils/ctdlmigrate.c b/citadel/utils/ctdlmigrate.c
index d89a77e5b38b879814e1a37fc1d36a0be5415f83..c3646c3e41614c45e64b752e5e7bf843ea9ab81e 100644 (file)
--- a/citadel/utils/ctdlmigrate.c
+++ b/citadel/utils/ctdlmigrate.c
@@ -102,7 +102,7 @@ int main(int argc, char *argv[])
                "to a new host system via a network connection, without disturbing\n"
                "the source system.  The target may be a different CPU architecture\n"
                "and/or operating system.  The source system should be running\n"
-               "Citadel %d.%02d or newer, and the target system should be running\n"
+               "Citadel version %d or newer, and the target system should be running\n"
                "either the same version or a newer version.  You will also need\n"
                "the 'rsync' utility, and OpenSSH v4 or newer.\n"
                "\n"
@@ -111,8 +111,7 @@ int main(int argc, char *argv[])
                "\n"
                "Do you wish to continue? "
                ,
-               EXPORT_REV_MIN / 100,
-               EXPORT_REV_MIN % 100
+               EXPORT_REV_MIN
        );
 
        if ((fgets(yesno, sizeof yesno, stdin) == NULL) || (tolower(yesno[0]) != 'y')) {

diff --git a/webcit/tests/test_main.c b/webcit/tests/test_main.c
index 267d0db876e1a8cd84a248c05ee489de657212aa..1316da3f6c857faeaa0f155ca3e6b09d53071096 100644 (file)
--- a/webcit/tests/test_main.c
+++ b/webcit/tests/test_main.c
@@ -3,7 +3,7 @@
  * waiting on the specified port for incoming HTTP connections.  When a
  * connection is established, it calls context_loop() from context_loop.c.
  *
- * Copyright (c) 1996-2012 by the citadel.org developers.
+ * Copyright (c) 1996-2016 by the citadel.org developers.
  * This program is released under the terms of the GNU General Public License v3.
  */
 
@@ -86,10 +86,8 @@ int main(int argc, char **argv)
 
        /* Ensure that we are linked to the correct version of libcitadel */
        if (libcitadel_version_number() < LIBCITADEL_VERSION_NUMBER) {
-               fprintf(stderr, " You are running libcitadel version %d.%02d\n",
-                       (libcitadel_version_number() / 100), (libcitadel_version_number() % 100));
-               fprintf(stderr, "WebCit was compiled against version %d.%02d\n",
-                       (LIBCITADEL_VERSION_NUMBER / 100), (LIBCITADEL_VERSION_NUMBER % 100));
+               fprintf(stderr, " You are running libcitadel version %d\n", (libcitadel_version_number()));
+               fprintf(stderr, "WebCit was compiled against version %d\n", LIBCITADEL_VERSION_NUMBER);
                return(1);
        }