[Git][NTPsec/ntpsec][master] Replace an obsolete BDism: (caddr_t) becomes (void *).
Eric S. Raymond
gitlab at mg.gitlab.com
Sun Aug 13 14:11:23 UTC 2017
Eric S. Raymond pushed to branch master at NTPsec / ntpsec
Commits:
011756aa by Eric S. Raymond at 2017-08-13T10:09:40-04:00
Replace an obsolete BDism: (caddr_t) becomes (void *).
- - - - -
3 changed files:
- ntpd/refclock_generic.c
- ntpd/refclock_neoclock.c
- ntpd/refclock_nmea.c
Changes:
=====================================
ntpd/refclock_generic.c
=====================================
--- a/ntpd/refclock_generic.c
+++ b/ntpd/refclock_generic.c
@@ -1886,8 +1886,8 @@ local_input(
{ /* simulate receive */
buf = get_free_recv_buffer();
if (buf != NULL) {
- memmove((caddr_t)buf->recv_buffer,
- (caddr_t)&parse->parseio.parse_dtime,
+ memmove((void *)buf->recv_buffer,
+ (void *)&parse->parseio.parse_dtime,
sizeof(parsetime_t));
buf->recv_length = sizeof(parsetime_t);
buf->recv_time = rbufp->recv_time;
@@ -1904,8 +1904,8 @@ local_input(
}
else
{
- memmove((caddr_t)rbufp->recv_buffer,
- (caddr_t)&parse->parseio.parse_dtime,
+ memmove((void *)rbufp->recv_buffer,
+ (void *)&parse->parseio.parse_dtime,
sizeof(parsetime_t));
parse_iodone(&parse->parseio);
rbufp->recv_length = sizeof(parsetime_t);
@@ -1944,8 +1944,8 @@ local_receive(
}
clear_err(parse, ERR_BADIO);
- memmove((caddr_t)&parsetime,
- (caddr_t)rbufp->recv_buffer,
+ memmove((void *)&parsetime,
+ (void *)rbufp->recv_buffer,
sizeof(parsetime_t));
DPRINT(4, ("PARSE receiver #%d: status %06x, state %08x, time(fp) %lx.%08lx, stime(fp) %lx.%08lx, ptime(fp) %lx.%08lx\n",
@@ -2356,7 +2356,7 @@ parse_shutdown(
parse->peer->refclkunit, parse->parse_type->cl_description);
parse->peer = (struct peer *)0; /* unused now */
- peer->procptr->unitptr = (caddr_t)0;
+ peer->procptr->unitptr = (void *)0;
free(parse);
}
@@ -2552,7 +2552,7 @@ parse_start(
parse = emalloc_zero(sizeof(*parse));
parse->generic = peer->procptr; /* link up */
- parse->generic->unitptr = (caddr_t)parse; /* link down */
+ parse->generic->unitptr = (void *)parse; /* link down */
/*
* Set up the structures
@@ -5293,7 +5293,7 @@ rawdcf_init_1(
*/
int sl232;
- if (ioctl(parse->generic->io.fd, TIOCMGET, (caddr_t)&sl232) == -1)
+ if (ioctl(parse->generic->io.fd, TIOCMGET, (void *)&sl232) == -1)
{
msyslog(LOG_NOTICE, "PARSE receiver #%d: rawdcf_init_1: WARNING: ioctl(fd, TIOCMGET, [C|T]IOCM_DTR): %m", parse->peer->refclkunit);
return 0;
@@ -5305,7 +5305,7 @@ rawdcf_init_1(
sl232 = (sl232 & ~CIOCM_RTS) | CIOCM_DTR; /* turn on DTR, clear RTS for power supply */
#endif
- if (ioctl(parse->generic->io.fd, TIOCMSET, (caddr_t)&sl232) == -1)
+ if (ioctl(parse->generic->io.fd, TIOCMSET, (void *)&sl232) == -1)
{
msyslog(LOG_NOTICE, "PARSE receiver #%d: rawdcf_init_1: WARNING: ioctl(fd, TIOCMSET, [C|T]IOCM_DTR): %m", parse->peer->refclkunit);
}
@@ -5340,7 +5340,7 @@ rawdcf_init_2(
*/
int sl232;
- if (ioctl(parse->generic->io.fd, TIOCMGET, (caddr_t)&sl232) == -1)
+ if (ioctl(parse->generic->io.fd, TIOCMGET, (void *)&sl232) == -1)
{
msyslog(LOG_NOTICE, "PARSE receiver #%d: rawdcf_init_2: WARNING: ioctl(fd, TIOCMGET, [C|T]IOCM_RTS): %m", parse->peer->refclkunit);
return 0;
@@ -5352,7 +5352,7 @@ rawdcf_init_2(
sl232 = (sl232 & ~CIOCM_DTR) | CIOCM_RTS; /* turn on RTS, clear DTR for power supply */
#endif
- if (ioctl(parse->generic->io.fd, TIOCMSET, (caddr_t)&sl232) == -1)
+ if (ioctl(parse->generic->io.fd, TIOCMSET, (void *)&sl232) == -1)
{
msyslog(LOG_NOTICE, "PARSE receiver #%d: rawdcf_init_2: WARNING: ioctl(fd, TIOCMSET, [C|T]IOCM_RTS): %m", parse->peer->refclkunit);
}
=====================================
ntpd/refclock_neoclock.c
=====================================
--- a/ntpd/refclock_neoclock.c
+++ b/ntpd/refclock_neoclock.c
@@ -198,7 +198,7 @@ neoclock4x_start(int unit,
#if defined(TIOCMSET) && (defined(TIOCM_RTS) || defined(CIOCM_RTS))
/* turn on RTS, and DTR for power supply */
/* NeoClock4x is powered from serial line */
- if(ioctl(fd, TIOCMGET, (caddr_t)&sl232) == -1)
+ if(ioctl(fd, TIOCMGET, (void *)&sl232) == -1)
{
msyslog(LOG_CRIT, "NeoClock4X(%d): can't query RTS/DTR state: %m", unit);
(void) close(fd);
@@ -209,7 +209,7 @@ neoclock4x_start(int unit,
#else
sl232 = sl232 | CIOCM_DTR | CIOCM_RTS; /* turn on RTS, and DTR for power supply */
#endif
- if(ioctl(fd, TIOCMSET, (caddr_t)&sl232) == -1)
+ if(ioctl(fd, TIOCMSET, (void *)&sl232) == -1)
{
msyslog(LOG_CRIT, "NeoClock4X(%d): can't set RTS/DTR to power neoclock4x: %m", unit);
(void) close(fd);
@@ -349,7 +349,7 @@ neoclock4x_shutdown(int unit,
#if defined(TIOCMSET) && (defined(TIOCM_RTS) || defined(CIOCM_RTS))
/* turn on RTS, and DTR for power supply */
/* NeoClock4x is powered from serial line */
- if(ioctl(pp->io.fd, TIOCMGET, (caddr_t)&sl232) == -1)
+ if(ioctl(pp->io.fd, TIOCMGET, (void *)&sl232) == -1)
{
msyslog(LOG_CRIT, "NeoClock4X(%d): can't query RTS/DTR state: %m",
unit);
@@ -361,7 +361,7 @@ neoclock4x_shutdown(int unit,
/* turn on RTS, and DTR for power supply */
sl232 &= ~(CIOCM_DTR | CIOCM_RTS);
#endif
- if(ioctl(pp->io.fd, TIOCMSET, (caddr_t)&sl232) == -1)
+ if(ioctl(pp->io.fd, TIOCMSET, (void *)&sl232) == -1)
{
msyslog(LOG_CRIT, "NeoClock4X(%d): can't set RTS/DTR to power neoclock4x: %m",
unit);
=====================================
ntpd/refclock_nmea.c
=====================================
--- a/ntpd/refclock_nmea.c
+++ b/ntpd/refclock_nmea.c
@@ -455,7 +455,7 @@ nmea_start(
}
/* Allocate and initialize unit structure */
- pp->unitptr = (caddr_t)up;
+ pp->unitptr = (void *)up;
pp->io.fd = -1;
pp->io.clock_recv = nmea_receive;
pp->io.srcclock = peer;
@@ -519,7 +519,7 @@ nmea_shutdown(
#endif
free(up);
}
- pp->unitptr = (caddr_t)NULL;
+ pp->unitptr = (void *)NULL;
if (-1 != pp->io.fd)
io_closeclock(&pp->io);
pp->io.fd = -1;
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/011756aa34784f03d0d37b9f43de4cfdc270e021
---
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/011756aa34784f03d0d37b9f43de4cfdc270e021
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20170813/0c43fe07/attachment.html>
More information about the vc
mailing list