[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gpsd-commit-watch
Subject:    [Gpsd-commit-watch] r6904 - trunk
From:       esr at BerliOS <esr () mail ! berlios ! de>
Date:       2009-12-31 16:09:18
Message-ID: 200912311609.nBVG9ItJ004395 () sheep ! berlios ! de
[Download RAW message or body]

Author: esr
Date: 2009-12-31 17:09:17 +0100 (Thu, 31 Dec 2009)
New Revision: 6904

Modified:
   trunk/bsd-base64.c
   trunk/net_ntrip.c
   trunk/ntpshm.c
Log:
Git rid of u_char, and some splint cleanup.


Modified: trunk/bsd-base64.c
===================================================================
--- trunk/bsd-base64.c	2009-12-24 02:20:37 UTC (rev 6903)
+++ trunk/bsd-base64.c	2009-12-31 16:09:17 UTC (rev 6904)
@@ -125,11 +125,11 @@
 
 /*@ +matchanyintegral -type @*/
 int
-b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize)
+b64_ntop(unsigned char const *src, size_t srclength, char *target, size_t targsize)
 {
 	size_t datalength = 0;
-	u_char input[3];
-	u_char output[4];
+	unsigned char input[3];
+	unsigned char output[4];
 	size_t i;
 
 	while (2 < srclength) {
@@ -194,7 +194,7 @@
 
 /*@ +matchanyintegral +charint @*/
 int
-b64_pton(char const *src, u_char *target, size_t targsize)
+b64_pton(char const *src, unsigned char *target, size_t targsize)
 {
 	size_t tarindex;
 	int state, ch;

Modified: trunk/net_ntrip.c
===================================================================
--- trunk/net_ntrip.c	2009-12-24 02:20:37 UTC (rev 6903)
+++ trunk/net_ntrip.c	2009-12-31 16:09:17 UTC (rev 6904)
@@ -316,7 +316,7 @@
 	if (!auth)
 	    return -1;
 	memset(authenc, 0, sizeof(authenc));
-	if (b64_ntop((u_char *) auth, strlen(auth), authenc, sizeof(authenc) - 1) < 0)
+	if (b64_ntop((unsigned char *) auth, strlen(auth), authenc, sizeof(authenc) - 1) < 0)
 	    return -1;
 	(void)snprintf(buf, size - 1, "Authorization: Basic %s\r\n", authenc);
     } else {

Modified: trunk/ntpshm.c
===================================================================
--- trunk/ntpshm.c	2009-12-24 02:20:37 UTC (rev 6903)
+++ trunk/ntpshm.c	2009-12-31 16:09:17 UTC (rev 6904)
@@ -80,7 +80,7 @@
     }
 
     shmid=shmget ((key_t)(NTPD_BASE+unit),
-		      sizeof (struct shmTime), IPC_CREAT|perms);
+		  sizeof (struct shmTime), (int)(IPC_CREAT|perms));
     if (shmid == -1) {
 	gpsd_report(LOG_ERROR, "NTPD shmget(%ld, %ld, %o) fail: %s\n",
 	   (long int)(NTPD_BASE+unit),sizeof (struct shmTime), (int)0777, strerror(errno));

_______________________________________________
Gpsd-commit-watch mailing list
Gpsd-commit-watch@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/gpsd-commit-watch
[prev in list] [next in list] [prev in thread] [next in thread]