From: Frank Kardel <kardel@ntp.org>
Date: Sat, 24 Jun 2006 18:24:35 +0000 (+0000)
Subject: data_mbg.c, refclock_parse.c, mbg_gps166.h, clk_rawdcf.c:
X-Git-Tag: NTP_4_2_2P0_RC5~1^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a49d4b3fcf5f71e90fe30739fc879b59e6ffd8bb;p=thirdparty%2Fntp.git

data_mbg.c, refclock_parse.c, mbg_gps166.h, clk_rawdcf.c:
  fix gcc 4 signedness complaints

bk: 449d8363NnRCBVnNtndzil2gcumxuQ
---

diff --git a/include/mbg_gps166.h b/include/mbg_gps166.h
index 4fb7e8e2c..edaae9df2 100644
--- a/include/mbg_gps166.h
+++ b/include/mbg_gps166.h
@@ -1,7 +1,7 @@
 /*
- * /src/NTP/REPOSITORY/ntp4-dev/include/mbg_gps166.h,v 4.6 2005/10/07 22:11:56 kardel RELEASE_20051008_A
+ * /src/NTP/REPOSITORY/ntp4-dev/include/mbg_gps166.h,v 4.7 2006/06/22 18:41:43 kardel RELEASE_20060622_A
  *
- * mbg_gps166.h,v 4.6 2005/10/07 22:11:56 kardel RELEASE_20051008_A
+ * mbg_gps166.h,v 4.7 2006/06/22 18:41:43 kardel RELEASE_20060622_A
  *
  * $Created: Sun Jul 20 09:20:50 1997 $
  *
@@ -524,8 +524,8 @@ typedef struct {
 
 } IONO;
 
-void mbg_tm_str P((unsigned char **, TM *, int));
-void mbg_tgps_str P((unsigned char **, T_GPS *, int));
+void mbg_tm_str P((char **, TM *, int));
+void mbg_tgps_str P((char **, T_GPS *, int));
 void get_mbg_header P((unsigned char **, GPS_MSG_HDR *));
 void put_mbg_header P((unsigned char **, GPS_MSG_HDR *));
 void get_mbg_sw_rev P((unsigned char **, SW_REV *));
@@ -555,6 +555,9 @@ unsigned long mbg_csum P((unsigned char *, unsigned int));
  * History:
  *
  * mbg_gps166.h,v
+ * Revision 4.7  2006/06/22 18:41:43  kardel
+ * clean up signedness (gcc 4)
+ *
  * Revision 4.6  2005/10/07 22:11:56  kardel
  * bounded buffer implementation
  *
diff --git a/libparse/clk_rawdcf.c b/libparse/clk_rawdcf.c
index f0291bfcd..3ef36c43e 100644
--- a/libparse/clk_rawdcf.c
+++ b/libparse/clk_rawdcf.c
@@ -1,7 +1,7 @@
 /*
- * /src/NTP/ntp4-dev/libparse/clk_rawdcf.c,v 4.16 2006/01/22 15:51:22 kardel RELEASE_20060122_A
+ * /src/NTP/REPOSITORY/ntp4-dev/libparse/clk_rawdcf.c,v 4.18 2006/06/22 18:40:01 kardel RELEASE_20060622_A
  *  
- * clk_rawdcf.c,v 4.16 2006/01/22 15:51:22 kardel RELEASE_20060122_A
+ * clk_rawdcf.c,v 4.18 2006/06/22 18:40:01 kardel RELEASE_20060622_A
  *
  * Raw DCF77 pulse clock support
  *
@@ -129,8 +129,8 @@ static struct dcfparam
 	unsigned char *zerobits;
 } dcfparameter = 
 {
-	"###############RADMLS1248124P124812P1248121241248112481248P??", /* 'ONE' representation */
-	"--------------------s-------p------p----------------------p__"  /* 'ZERO' representation */
+	(unsigned char *)"###############RADMLS1248124P124812P1248121241248112481248P??", /* 'ONE' representation */
+	(unsigned char *)"--------------------s-------p------p----------------------p__"  /* 'ZERO' representation */
 };
 
 static struct rawdcfcode 
@@ -602,6 +602,12 @@ int clk_rawdcf_bs;
  * History:
  *
  * clk_rawdcf.c,v
+ * Revision 4.18  2006/06/22 18:40:01  kardel
+ * clean up signedness (gcc 4)
+ *
+ * Revision 4.17  2006/01/22 16:01:55  kardel
+ * update version information
+ *
  * Revision 4.16  2006/01/22 15:51:22  kardel
  * generate reasonable timecode output on invalid input
  *
diff --git a/libparse/data_mbg.c b/libparse/data_mbg.c
index bf8472cfc..9b6f1aae2 100644
--- a/libparse/data_mbg.c
+++ b/libparse/data_mbg.c
@@ -1,7 +1,7 @@
 /*
- * /src/NTP/REPOSITORY/ntp4-dev/libparse/data_mbg.c,v 4.7 2005/10/07 22:11:10 kardel RELEASE_20051008_A
+ * /src/NTP/REPOSITORY/ntp4-dev/libparse/data_mbg.c,v 4.8 2006/06/22 18:40:01 kardel RELEASE_20060622_A
  *
- * data_mbg.c,v 4.7 2005/10/07 22:11:10 kardel RELEASE_20051008_A
+ * data_mbg.c,v 4.8 2006/06/22 18:40:01 kardel RELEASE_20060622_A
  *
  * $Created: Sun Jul 20 12:08:14 1997 $
  *
@@ -47,7 +47,7 @@
 #include "ieee754io.h"
 
 static void get_mbg_tzname P((unsigned char **, char *));
-static void mbg_time_status_str P((unsigned char **, unsigned int, int));
+static void mbg_time_status_str P((char **, unsigned int, int));
 
 #if 0				/* no actual floats on Meinberg binary interface */
 static offsets_t mbg_float  = { 1, 0, 3, 2, 0, 0, 0, 0 }; /* byte order for meinberg floats */
@@ -208,7 +208,7 @@ get_mbg_antinfo(
 
 static void
 mbg_time_status_str(
-	unsigned char **buffpp,
+	char **buffpp,
 	unsigned int status,
 	int size
 	)
@@ -230,7 +230,7 @@ mbg_time_status_str(
 
 	if (status)
 	{
-		unsigned char *start, *p;
+		char *start, *p;
 		struct state *s;
 	
 		start = p = *buffpp;
@@ -244,8 +244,8 @@ mbg_time_status_str(
 					strncpy(p, ", ", size - (p - start));
 					p += 2;
 				}
-				strncpy((char *)p, s->string, size - (p - start));
-				p += strlen((char *)p);
+				strncpy(p, s->string, size - (p - start));
+				p += strlen(p);
 			}
 		}
 		*buffpp = p;
@@ -254,35 +254,35 @@ mbg_time_status_str(
       
 void
 mbg_tm_str(
-	unsigned char **buffpp,
+	char **buffpp,
 	TM *tmp,
 	int size
 	)
 {
-	unsigned char *s = *buffpp;
+	char *s = *buffpp;
 
-	snprintf((char *)*buffpp, size, "%04d-%02d-%02d %02d:%02d:%02d.%07ld (%c%02d%02d) ",
+	snprintf(*buffpp, size, "%04d-%02d-%02d %02d:%02d:%02d.%07ld (%c%02d%02d) ",
 		 tmp->year, tmp->month, tmp->mday,
 		 tmp->hour, tmp->minute, tmp->second, tmp->frac,
 		 (tmp->offs_from_utc < 0) ? '-' : '+',
 		 abs(tmp->offs_from_utc) / 3600,
 		 (abs(tmp->offs_from_utc) / 60) % 60);
-	*buffpp += strlen((char *)*buffpp);
+	*buffpp += strlen(*buffpp);
 
 	mbg_time_status_str(buffpp, tmp->status, size - (*buffpp - s));
 }
 
 void
 mbg_tgps_str(
-	unsigned char **buffpp,
+	char **buffpp,
 	T_GPS *tgpsp,
 	int size
 	)
 {
-	snprintf((char *)*buffpp, size, "week %d + %ld days + %ld.%07ld sec",
+	snprintf(*buffpp, size, "week %d + %ld days + %ld.%07ld sec",
 		 tgpsp->wn, tgpsp->sec / 86400,
 		 tgpsp->sec % 86400, tgpsp->tick);
-	*buffpp += strlen((char *)*buffpp);
+	*buffpp += strlen(*buffpp);
 }
 
 void
@@ -508,6 +508,9 @@ get_mbg_iono(
 
 /*
  * data_mbg.c,v
+ * Revision 4.8  2006/06/22 18:40:01  kardel
+ * clean up signedness (gcc 4)
+ *
  * Revision 4.7  2005/10/07 22:11:10  kardel
  * bounded buffer implementation
  *
diff --git a/ntpd/refclock_parse.c b/ntpd/refclock_parse.c
index 5809b96aa..2360f40ee 100644
--- a/ntpd/refclock_parse.c
+++ b/ntpd/refclock_parse.c
@@ -1,7 +1,7 @@
 /*
- * /src/NTP/REPOSITORY/ntp4-dev/ntpd/refclock_parse.c,v 4.73 2006/05/26 14:23:46 kardel RELEASE_20060526_A
+ * /src/NTP/REPOSITORY/ntp4-dev/ntpd/refclock_parse.c,v 4.76 2006/06/22 18:40:47 kardel RELEASE_20060622_A
  *
- * refclock_parse.c,v 4.73 2006/05/26 14:23:46 kardel RELEASE_20060526_A
+ * refclock_parse.c,v 4.76 2006/06/22 18:40:47 kardel RELEASE_20060622_A
  *
  * generic reference clock driver for several DCF/GPS/MSF/... receivers
  *
@@ -182,7 +182,7 @@
 #include "ieee754io.h"
 #include "recvbuff.h"
 
-static char rcsid[] = "refclock_parse.c,v 4.73 2006/05/26 14:23:46 kardel RELEASE_20060526_A";
+static char rcsid[] = "refclock_parse.c,v 4.76 2006/06/22 18:40:47 kardel RELEASE_20060622_A";
 
 /**===========================================================================
  ** external interface to ntp mechanism
@@ -4154,8 +4154,8 @@ gps16x_message(
 			case GPS_ANT_INFO:
 				{
 					ANT_INFO antinfo;
-					u_char buffer[512];
-					u_char *p;
+					char buffer[512];
+					char *p;
 					
 					get_mbg_antinfo(&bufp, &antinfo);
 					snprintf(buffer, sizeof(buffer), "meinberg_antenna_status=\"");
@@ -4211,8 +4211,8 @@ gps16x_message(
 			case GPS_CFGH:
 				{
 					CFGH cfgh;
-					u_char buffer[512];
-					u_char *p;
+					char buffer[512];
+					char *p;
 					
 					get_mbg_cfgh(&bufp, &cfgh);
 					if (cfgh.valid)
@@ -5685,6 +5685,13 @@ int refclock_parse_bs;
  * History:
  *
  * refclock_parse.c,v
+ * Revision 4.76  2006/06/22 18:40:47  kardel
+ * clean up signedness (gcc 4)
+ *
+ * Revision 4.75  2006/06/22 16:58:10  kardel
+ * Bug #632: call parse_ppsapi() in parse_ctl() when updating
+ * the PPS offset. Fix sign of offset passed to kernel.
+ *
  * Revision 4.74  2006/06/18 21:18:37  kardel
  * NetBSD Coverity CID 3796: possible NULL deref
  *