Rename round() function to avoid clash with builtin

Kevin Lyda writes:
I enclose the following patch which removes all but three of the warnings.  i
don't have any non-linux systems handy to test a fix to the round() function.
but having it return a double should be fine.

It doesn't actually fix anything, it just shuts up -Wall, so it's certainly an
optional type of patch.

.gitignore

@@ -0,0 +1,6 @@
+*.swp
+*.o
+Makefile
+chronyc
+chronyd
+version.h

acquire.c

@@ -358,7 +358,7 @@ read_from_socket(void *anything)
   int status;
   ReceiveBuffer msg;
   struct sockaddr_in his_addr;
-  int his_addr_len;
+  socklen_t his_addr_len;
   int flags;
   int message_length;
   unsigned long remote_ip;

addrfilt.c

@@ -6,7 +6,7 @@
   chronyd/chronyc - Programs for keeping computer clocks accurate.
 
  **********************************************************************
- * Copyright (C) Richard P. Curnow  1997-2002
+ * Copyright (C) Richard P. Curnow  1997,1998,1999,2000,2001,2002,2005
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -43,15 +43,11 @@
 /* Define the table size */
 #define TABLE_SIZE (1UL<<NBITS)
 
-struct _TableNode;
-
-typedef struct _TableNode ExtendedTable[TABLE_SIZE];
-
 typedef enum {DENY, ALLOW, AS_PARENT} State;
 
 typedef struct _TableNode {
   State state;
-  ExtendedTable *extended;
+  struct _TableNode *extended;
 } TableNode;
 
 struct ADF_AuthTableInst {
@@ -101,7 +97,7 @@ close_node(TableNode *node)
 
   if (node->extended != NULL) {
     for (i=0; i<TABLE_SIZE; i++) {
-      child_node = &((*(node->extended))[i]);
+      child_node = &(node->extended[i]);
       close_node(child_node);
     }
     Free(node->extended);
@@ -124,10 +120,10 @@ open_node(TableNode *node)
 
   if (node->extended == NULL) {
 
-    node->extended = MallocNew(ExtendedTable);
+    node->extended = MallocArray(struct _TableNode, TABLE_SIZE);
 
     for (i=0; i<TABLE_SIZE; i++) {
-      child_node = &((*(node->extended))[i]);
+      child_node = &(node->extended[i]);
       child_node->state = AS_PARENT;
       child_node->extended = NULL;
     }
@@ -168,7 +164,7 @@ set_subnet(TableNode *start_node,
         if (!(node->extended)) {
           open_node(node);
         }
-        node = &((*(node->extended))[subnet]);
+        node = &(node->extended[subnet]);
         bits_to_go -= NBITS;
       }
 
@@ -187,7 +183,7 @@ set_subnet(TableNode *start_node,
         if (!(node->extended)) {
           open_node(node);
         }
-        node = &((*(node->extended))[subnet]);
+        node = &(node->extended[subnet]);
         bits_to_go -= NBITS;
       }
 
@@ -199,7 +195,7 @@ set_subnet(TableNode *start_node,
       }
       
       for (i=subnet, j=0; j<N; i++, j++) {
-        this_node = &((*(node->extended))[i]);
+        this_node = &(node->extended[i]);
         if (delete_children) {
           close_node(this_node);
         }
@@ -283,7 +279,7 @@ check_ip_in_node(TableNode *start_node, unsigned long ip)
     if (node->extended) {
       subnet = get_subnet(residual);
       residual = get_residual(residual);
-      node = &((*(node->extended))[subnet]);
+      node = &(node->extended[subnet]);
     } else {
       /* Make decision on this node */
       finished = 1;

build_kit

@@ -1,45 +0,0 @@
-#!/usr/bin/env perl
-# $Header: /cvs/src/chrony/build_kit,v 1.13 2003/01/12 23:50:54 richard Exp $
-# Perl script for building a release
-
-# Have to run it in the current directory
-if (($0 ne "build_kit") && ($0 ne "./build_kit")) {
-  die "Have to be in the checked-out directory to run build_kit";
-}
-
-$here=`pwd`;
-chomp $here;
-$version=$here;
-$version =~ s,^.*/chrony-([^/]+)$,$1, || die "Didn't recognize directory name";
-print "Building kit for version $version\n";
-
-chmod 0755, "configure";
-
-# Overwrite normal version.h file with version-specific one
-open (OUT, ">version.txt");
-print OUT $version."\n";
-close OUT;
-
-# Construct chrony.spec file
-open (IN, "<chrony.spec.sample");
-open (OUT, ">chrony.spec");
-while (<IN>) {
-  s/\@\@VERSION\@\@/$version/;
-  print OUT;
-}
-close (IN);
-close (OUT);
-
-
-# Requires the makeinfo from texinfo v4
-system("makeinfo --no-headers --number-sections -o chrony.txt chrony.texi");
-system ("rm -rf ./{arch}");
-system ("rm -rf ./.arch-ids");
-unlink "chrony.spec.sample";
-unlink("build_kit");
-
-chdir ("..");
-system ("tar cvf - chrony-$version | gzip -9 > chrony-$version.tar.gz");
-system ("gpg -b -a -o chrony-$version-tar-gz-asc.txt chrony-$version.tar.gz");
-
-

chrony.1

@@ -63,3 +63,6 @@ Richard Curnow <rc@rc0.org.uk>
 This man-page was written by Jan Schaumann <jschauma@netmeister.org> as part
 of "The Missing Man Pages Project".  Please see
 \fIhttp://www.netmeister.org/misc/m2p2/index.html\fR for details.
+
+The complete chrony documentation is supplied in texinfo format.
+

chrony.conf.5

@@ -47,3 +47,6 @@ Richard Curnow <rc@rc0.org.uk>
 This man-page was written by Jan Schaumann <jschauma@netmeister.org> as part of "The Missing
 Man Pages Project".  Please see \fIhttp://www.netmeister.org/misc/m2p2/index.html\fR
 for details.
+
+The complete chrony documentation is supplied in texinfo format.
+

chronyc.1

@@ -40,10 +40,10 @@ interactively.
 1.17
 
 .SH BUGS
-To report bugs, please contact the author and/or visit \fIhttp://go.to/chrony\fR
+To report bugs, please contact the author and/or visit \fIhttp://chrony.sunsite.dk/\fR
 
 .SH "SEE ALSO"
-.BR chronyd(1),
+.BR chronyd(8),
 .BR chrony(1)
 
 .I http://chrony.sunsite.dk/
@@ -54,3 +54,6 @@ Richard Curnow <rc@rc0.org.uk>
 This man-page was written by Jan Schaumann <jschauma@netmeister.org> as part of "The Missing
 Man Pages Project".  Please see \fIhttp://www.netmeister.org/misc/m2p2/index.html\fR
 for details.
+
+The complete chrony documentation is supplied in texinfo format.
+

chronyd.8

@@ -109,3 +109,6 @@ Richard Curnow <rc@rc0.org.uk>
 This man-page was written by Jan Schaumann <jschauma@netmeister.org> as part
 of "The Missing Man Pages Project".  Please see
 \fIhttp://www.netmeister.org/misc/m2p2/index.html\fR for details.
+
+The complete chrony documentation is supplied in texinfo format.
+

client.c

@@ -146,7 +146,7 @@ read_line(void)
 static unsigned long
 get_address(const char *hostname)
 {
-  unsigned char *address0;
+  char *address0;
   struct hostent *host;
   unsigned long result;
 
@@ -746,7 +746,7 @@ static int
 accheck_getaddr(char *line, unsigned long *addr)
 {
   unsigned long a, b, c, d, ip;
-  unsigned char *p, *q;
+  char *p, *q;
   p = line;
   while (*p && isspace(*p)) p++;
   if (!*p) {
@@ -1124,7 +1124,7 @@ static int
 submit_request(CMD_Request *request, CMD_Reply *reply, int *reply_auth_ok)
 {
   unsigned long tx_sequence;
-  int where_from_len;
+  socklen_t where_from_len;
   struct sockaddr_in where_from;
   int bad_length, bad_sender, bad_sequence, bad_header;
   int select_status;
@@ -1652,7 +1652,7 @@ process_cmd_tracking(char *line)
     ref_time.tv_usec = ntohl(reply.data.tracking.ref_time_us);
     ref_time_tm = *gmtime((time_t *)&ref_time.tv_sec);
     printf("Ref time (UTC)  : %s", asctime(&ref_time_tm));
-    correction_tv.tv_sec = ntohl(reply.data.tracking.current_correction_s);
+    correction_tv.tv_sec = (int32_t)ntohl(reply.data.tracking.current_correction_s);
     correction_tv.tv_usec = ntohl(reply.data.tracking.current_correction_us);
     correction = (double) correction_tv.tv_sec + 1.0e-6 * correction_tv.tv_usec;
     printf("System time     : %.6f seconds %s of NTP time\n", fabs(correction),
@@ -2319,7 +2319,11 @@ process_line(char *line)
   /* Check for line being blank */
   p = line;
   while (*p && isspace((unsigned char)*p)) p++;
-  if (!*p) return quit;
+  if (!*p) {
+    fflush(stderr);
+    fflush(stdout);
+    return quit;
+  };
 
   if (!strncmp(p, "offline", 7)) {
     do_normal_submit = process_cmd_offline(&tx_message, p+7);
@@ -2480,7 +2484,8 @@ process_line(char *line)
       }
     }
   }
-
+  fflush(stderr);
+  fflush(stdout);
   return quit;
 }
 

cmdmon.c

@@ -1584,7 +1584,7 @@ read_from_cmd_socket(void *anything)
   CMD_Reply tx_message, *prev_tx_message;
   int rx_message_length, tx_message_length;
   struct sockaddr_in where_from;
-  int from_length;
+  socklen_t from_length;
   unsigned long remote_ip;
   unsigned short remote_port;
   int md5_ok;

configure

@@ -248,7 +248,7 @@ case $SYSTEM in
         fi
     ;;
 
-    BSD/386-i[3456]86 )
+    BSD/386-i[3456]86|FreeBSD-i386 )
         # Antti Jrvinen <costello@iki.fi> reported that this system can
         # be supported with the SunOS 4.x driver files.
         EXTRA_OBJECTS="sys_sunos.o strerror.o"

io_linux.h

@@ -15,7 +15,8 @@
 #define CHRONY_IOC_NONE	0U
 #define CHRONY_IOC_WRITE	1U
 #define CHRONY_IOC_READ	2U
-#elif defined(__alpha__) || defined(__sparc__)
+
+#elif defined(__alpha__) || defined(__sparc__) || defined(__ppc__) || defined(__ppc64__) || defined(__sparc64__)
 #define CHRONY_IOC_NRBITS	8
 #define CHRONY_IOC_TYPEBITS	8
 #define CHRONY_IOC_SIZEBITS	13
@@ -24,6 +25,16 @@
 #define CHRONY_IOC_NONE        1U
 #define CHRONY_IOC_READ        2U
 #define CHRONY_IOC_WRITE       4U
+
+#elif defined(__mips__) || defined(__mips32__)
+#define CHRONY_IOC_NRBITS       8
+#define CHRONY_IOC_TYPEBITS     8
+#define CHRONY_IOC_SIZEBITS     13
+#define CHRONY_IOC_DIRBITS      3
+#define CHRONY_IOC_NONE         1U
+#define CHRONY_IOC_READ         2U
+#define CHRONY_IOC_WRITE        4U
+
 #else
 #error "I don't know the values of the _IOC_* constants for your architecture"
 #endif

logging.c

@@ -116,7 +116,7 @@ LOG_Line_Function(LOG_Severity severity, LOG_Facility facility, const char *form
 
 /* ================================================== */
 
-volatile void
+void
 LOG_Fatal_Function(LOG_Facility facility, const char *format, ...)
 {
   char buf[2048];

logging.h

@@ -77,7 +77,7 @@ extern void LOG_Finalise(void);
 extern void LOG_Line_Function(LOG_Severity severity, LOG_Facility facility, const char *format, ...);
 
 /* Logging function for fatal errors */
-extern volatile void LOG_Fatal_Function(LOG_Facility facility, const char *format, ...);
+extern void LOG_Fatal_Function(LOG_Facility facility, const char *format, ...);
 
 /* Position in code reporting function */
 extern void LOG_Position(const char *filename, int line_number, const char *function_name);

main.c

@@ -74,7 +74,7 @@ delete_pidfile(void)
 
 /* ================================================== */
 
-volatile void
+void
 MAI_CleanupAndExit(void)
 {
   if (!initialised) exit(0);

main.h

@@ -32,7 +32,7 @@
 #define GOT_MAIN_H
 
 /* Function to clean up at end of run */
-extern volatile void MAI_CleanupAndExit(void);
+extern void MAI_CleanupAndExit(void);
 
 #endif /* GOT_MAIN_H */
 

make_release

@@ -0,0 +1,52 @@
+#!/usr/bin/env perl
+
+$tool = "chrony";
+
+$version = shift || die "Usage : $0 <version>\n";
+$subdir = "${tool}-${version}";
+
+unless (-d ".git") {
+  die "No .git subdirectory?"
+}
+
+unless (-d "RELEASES") {
+  mkdir "RELEASES", 0755;
+}
+
+system ("git-tag -s $version");
+die "git-tag failed" if ($? != 0);
+if (-d "RELEASES/$subdir") {
+  system ("rm -rf RELEASES/$subdir");
+}
+
+system ("git-tar-tree $version RELEASES/${subdir} | tar xf -");
+die "git-tar-tree failed" if ($? != 0);
+
+chdir "RELEASES";
+$here = qx/pwd/;
+chomp $here;
+chdir $subdir;
+
+open (OUT, ">version.txt");
+print OUT $version."\n";
+close OUT;
+
+open (IN, "<${tool}.spec.sample");
+open (OUT, ">${tool}.spec");
+while (<IN>) {
+  s/\@\@VERSION\@\@/$version/;
+  print OUT;
+}
+close (IN);
+close (OUT);
+
+system("makeinfo --no-headers --number-sections -o chrony.txt chrony.texi");
+unlink "make_release";
+unlink "${tool}.spec.sample";
+unlink ".gitignore";
+
+chdir $here;
+system ("tar cvf - $subdir | gzip -9 > ${subdir}.tar.gz");
+system ("gpg -b -a -o ${subdir}-tar-gz-asc.txt ${subdir}.tar.gz");
+
+

nameserv.c

@@ -39,7 +39,7 @@ unsigned long
 DNS_Name2IPAddress(const char *name)
 {
   struct hostent *host;
-  unsigned char *address0;
+  char *address0;
   unsigned long result;
 
   host = gethostbyname(name);

ntp_core.c

@@ -378,7 +378,7 @@ generate_packet_auth(NTP_Packet *pkt, unsigned long keyid)
   if (keyok) {
     pkt->auth_keyid = htonl(keyid);
     MD5Init(&ctx);
-    MD5Update(&ctx, keytext, keylen);
+    MD5Update(&ctx, (unsigned char *) keytext, keylen);
     MD5Update(&ctx, (unsigned char *) pkt, offsetof(NTP_Packet, auth_keyid));
     MD5Final(&ctx);
     memcpy(&(pkt->auth_data), &ctx.digest, 16);
@@ -447,7 +447,7 @@ check_packet_auth(NTP_Packet *pkt, unsigned long keyid)
   if (keyok) {
     pkt->auth_keyid = htonl(keyid);
     MD5Init(&ctx);
-    MD5Update(&ctx, keytext, keylen);
+    MD5Update(&ctx, (unsigned char *) keytext, keylen);
     MD5Update(&ctx, (unsigned char *) pkt, offsetof(NTP_Packet, auth_keyid));
     MD5Final(&ctx);
     if (!memcmp((void *) &ctx.digest, (void *) &(pkt->auth_data), 16)) {

ntp_io.c

@@ -184,7 +184,7 @@ read_from_socket(void *anything)
   ReceiveBuffer message;
   int message_length;
   struct sockaddr_in where_from;
-  int from_length;
+  socklen_t from_length;
   unsigned int flags = 0;
   struct timeval now;
   NTP_Remote_Address remote_addr;

sys_linux.c

@@ -98,7 +98,7 @@ static void handle_end_of_slew(void *anything);
 /* ================================================== */
 
 inline static int
-round(double x) {
+our_round(double x) {
   int y;
   y = (int)(x + 0.5);
   while ((double)y < x - 0.5) y++;
@@ -433,7 +433,7 @@ set_frequency(double freq_ppm) {
     neg = 0;
   }
 
-  required_delta_tick = round(freq_ppm / dhz);
+  required_delta_tick = our_round(freq_ppm / dhz);
   required_freq = freq_ppm - dhz * (double) required_delta_tick;
 
   if (neg) {

sysincl.h

@@ -35,7 +35,7 @@
 
 #if defined (SOLARIS) || defined(SUNOS) || defined(LINUX) || defined(__NetBSD__)
 
-#if !defined(__NetBSD__)
+#if !defined(__NetBSD__) && !defined(__FreeBSD__)
 #include <alloca.h>
 #endif
 #include <assert.h>
@@ -43,7 +43,9 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <float.h>
+#if !defined(__FreeBSD__)
 #include <malloc.h>
+#endif
 #include <math.h>
 #include <netdb.h>
 #include <netinet/in.h>

version.txt

@@ -1,4 +1 @@
-#ifndef VERSION_H
-#define VERSION_H
-#define PROGRAM_VERSION_STRING "$Name: V1_12 $"
-#endif /* VERSION_H */
+DEVELOPMENT