d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Remove UM_* memory handling macros as they just obfuscate code.

Browse Source
This commit is contained in:
Andrew R. Reiter 2002-06-24 22:29:01 +00:00
parent 44081f9b35
commit 927c042095
4 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libatm/atm_addr.c
View File

@ -237,7 +237,7 @@ format_atm_addr(addr)
/* /*
* Clear the returned string * Clear the returned string
*/ */
UM_ZERO(str, sizeof(str)); bzero(str, sizeof(str));
strcpy(str, "-"); strcpy(str, "-");
/* /*

8
lib/libatm/cache_key.c
View File

@ -79,7 +79,7 @@ scsp_cache_key(ap, ip, ol, op)
/* /*
* Initialize * Initialize
*/ */
UM_ZERO(buff, sizeof(buff)); bzero(buff, sizeof(buff));
/* /*
* Copy the addresses into a buffer for MD5 computation * Copy the addresses into a buffer for MD5 computation
@ -87,8 +87,8 @@ scsp_cache_key(ap, ip, ol, op)
len = sizeof(struct in_addr) + ap->address_length; len = sizeof(struct in_addr) + ap->address_length;
if (len > sizeof(buff)) if (len > sizeof(buff))
len = sizeof(buff); len = sizeof(buff);
UM_COPY(ip, buff, sizeof(struct in_addr)); bcopy(ip, buff, sizeof(struct in_addr));
UM_COPY(ap->address, &buff[sizeof(struct in_addr)], bcopy(ap->address, &buff[sizeof(struct in_addr)],
len - sizeof(struct in_addr)); len - sizeof(struct in_addr));
/* /*
@ -101,7 +101,7 @@ scsp_cache_key(ap, ip, ol, op)
/* /*
* Fold the 16-byte digest to the required length * Fold the 16-byte digest to the required length
*/ */
UM_ZERO((caddr_t)op, ol); bzero((caddr_t)op, ol);
for (i = 0; i < 16; i++) { for (i = 0; i < 16; i++) {
op[i % ol] = op[i % ol] ^ digest[i]; op[i % ol] = op[i % ol] ^ digest[i];
} }

23
lib/libatm/ioctl_subr.c
View File

@ -104,7 +104,7 @@ do_info_ioctl(req, buf_len)
* Get memory for returned information * Get memory for returned information
*/ */
mem_retry: mem_retry:
buf = (caddr_t)UM_ALLOC(buf_len); buf = malloc(buf_len);
if (buf == NULL) { if (buf == NULL) {
errno = ENOMEM; errno = ENOMEM;
return(-1); return(-1);
@ -121,7 +121,7 @@ mem_retry:
*/ */
rc = ioctl(s, AIOCINFO, (caddr_t)req); rc = ioctl(s, AIOCINFO, (caddr_t)req);
if (rc) { if (rc) {
UM_FREE(buf); free(buf);
if (errno == ENOSPC) { if (errno == ENOSPC) {
buf_len = buf_len * 2; buf_len = buf_len * 2;
goto mem_retry; goto mem_retry;
@ -162,7 +162,7 @@ get_vcc_info(intf, vccp)
* Initialize IOCTL request * Initialize IOCTL request
*/ */
air.air_opcode = AIOCS_INF_VCC; air.air_opcode = AIOCS_INF_VCC;
UM_ZERO(air.air_vcc_intf, sizeof(air.air_vcc_intf)); bzero(air.air_vcc_intf, sizeof(air.air_vcc_intf));
if (intf != NULL && strlen(intf) != 0) if (intf != NULL && strlen(intf) != 0)
strcpy(air.air_vcc_intf, intf); strcpy(air.air_vcc_intf, intf);
@ -215,7 +215,7 @@ get_subnet_mask(intf, mask)
/* /*
* Set up and issue the IOCTL * Set up and issue the IOCTL
*/ */
UM_ZERO(&req, sizeof(req)); bzero(&req, sizeof(req));
strcpy(req.ifr_name, intf); strcpy(req.ifr_name, intf);
rc = ioctl(s, SIOCGIFNETMASK, (caddr_t)&req); rc = ioctl(s, SIOCGIFNETMASK, (caddr_t)&req);
(void)close(s); (void)close(s);
@ -269,7 +269,7 @@ get_mtu(intf)
/* /*
* Set up and issue the IOCTL * Set up and issue the IOCTL
*/ */
UM_ZERO(&req, sizeof(req)); bzero(&req, sizeof(req));
strcpy(req.ifr_name, intf); strcpy(req.ifr_name, intf);
rc = ioctl(s, SIOCGIFMTU, (caddr_t)&req); rc = ioctl(s, SIOCGIFMTU, (caddr_t)&req);
(void)close(s); (void)close(s);
@ -326,8 +326,7 @@ verify_nif_name(name)
/* /*
* Get memory for returned information * Get memory for returned information
*/ */
nif_info = (struct air_netif_rsp *)UM_ALLOC( nif_info = malloc(sizeof(struct air_netif_rsp));
sizeof(struct air_netif_rsp));
if (nif_info == NULL) { if (nif_info == NULL) {
errno = ENOMEM; errno = ENOMEM;
return(-1); return(-1);
@ -339,14 +338,14 @@ verify_nif_name(name)
air.air_opcode = AIOCS_INF_NIF; air.air_opcode = AIOCS_INF_NIF;
air.air_buf_addr = (caddr_t)nif_info; air.air_buf_addr = (caddr_t)nif_info;
air.air_buf_len = sizeof(struct air_netif_rsp); air.air_buf_len = sizeof(struct air_netif_rsp);
UM_ZERO(air.air_netif_intf, sizeof(air.air_netif_intf)); bzero(air.air_netif_intf, sizeof(air.air_netif_intf));
strcpy(air.air_netif_intf, name); strcpy(air.air_netif_intf, name);
/* /*
* Issue the IOCTL * Issue the IOCTL
*/ */
rc = ioctl(s, AIOCINFO, (caddr_t)&air); rc = ioctl(s, AIOCINFO, (caddr_t)&air);
UM_FREE(nif_info); free(nif_info);
(void)close(s); (void)close(s);
/* /*
@ -382,7 +381,7 @@ get_cfg_info ( intf, cfgp )
* Initialize IOCTL request * Initialize IOCTL request
*/ */
air.air_opcode = AIOCS_INF_CFG; air.air_opcode = AIOCS_INF_CFG;
UM_ZERO ( air.air_cfg_intf, sizeof(air.air_cfg_intf)); bzero ( air.air_cfg_intf, sizeof(air.air_cfg_intf));
if ( intf != NULL && strlen(intf) != 0 ) if ( intf != NULL && strlen(intf) != 0 )
strcpy ( air.air_cfg_intf, intf ); strcpy ( air.air_cfg_intf, intf );
@ -420,7 +419,7 @@ get_intf_info ( intf, intp )
* Initialize IOCTL request * Initialize IOCTL request
*/ */
air.air_opcode = AIOCS_INF_INT; air.air_opcode = AIOCS_INF_INT;
UM_ZERO ( air.air_int_intf, sizeof(air.air_int_intf)); bzero ( air.air_int_intf, sizeof(air.air_int_intf));
if ( intf != NULL && strlen(intf) != 0 ) if ( intf != NULL && strlen(intf) != 0 )
strcpy ( air.air_int_intf, intf ); strcpy ( air.air_int_intf, intf );
@ -459,7 +458,7 @@ get_netif_info ( intf, netp )
* Initialize IOCTL request * Initialize IOCTL request
*/ */
air.air_opcode = AIOCS_INF_NIF; air.air_opcode = AIOCS_INF_NIF;
UM_ZERO ( air.air_int_intf, sizeof(air.air_int_intf) ); bzero ( air.air_int_intf, sizeof(air.air_int_intf) );
if ( intf != NULL && strlen(intf) != 0 ) if ( intf != NULL && strlen(intf) != 0 )
strcpy ( air.air_int_intf, intf ); strcpy ( air.air_int_intf, intf );

4
lib/libatm/ip_addr.c
View File

@ -78,7 +78,7 @@ get_ip_addr(p)
/* /*
* Get IP address of specified host name * Get IP address of specified host name
*/ */
UM_ZERO(&sin, sizeof(sin)); bzero(&sin, sizeof(sin));
sin.sin_family = AF_INET; sin.sin_family = AF_INET;
if (p[0] >= '0' && p[0] <= '9') { if (p[0] >= '0' && p[0] <= '9') {
/* /*
@ -126,7 +126,7 @@ format_ip_addr(addr)
/* /*
* Initialize * Initialize
*/ */
UM_ZERO(host_name, sizeof(host_name)); bzero(host_name, sizeof(host_name));
/* /*
* Check for a zero address * Check for a zero address