diff options
| -rw-r--r-- | bsd-base64.c | 8 | ||||
| -rw-r--r-- | net_ntrip.c | 2 | ||||
| -rw-r--r-- | ntpshm.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/bsd-base64.c b/bsd-base64.c index 733f42eb..f182e6e8 100644 --- a/bsd-base64.c +++ b/bsd-base64.c @@ -125,11 +125,11 @@ static const char Pad64 = '='; /*@ +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 @@ b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize) /*@ +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; diff --git a/net_ntrip.c b/net_ntrip.c index 2ccd2537..3bbd2dc9 100644 --- a/net_ntrip.c +++ b/net_ntrip.c @@ -316,7 +316,7 @@ static int ntrip_auth_encode(const struct ntrip_stream_t *stream, 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 { @@ -80,7 +80,7 @@ static /*@null@*/ struct shmTime *getShmTime(int unit) } 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)); |