des_impl: Use bzero instead of __bzero

PATCH In review Felix Janda 2 participants 3 messages Apr 17, 2016

Subsystems (2)

NFS client NFS server

lore

Share & tools

lore

Felix Janda

author

2016-04-17 09:10 UTC #0 lore raw

PATCH 1/7 des_impl: Use bzero instead of __bzero

Fixes compilation error with musl libc:

.libs/libtirpc_la-des_impl.o: In function `_des_crypt':
src/des_impl.c:591: undefined reference to `__bzero'

Signed-off-by Felix Janda <[email protected]>

---
 src/des_impl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

src/des_impl.c +1 -1

index 9dbccaf..dbcfaa1 100644
@@ -588,7 +588,7 @@ _des_crypt (char *buf, unsigned len, struct desparams *desp)
     }
   tin0 = tin1 = tout0 = tout1 = xor0 = xor1 = 0;
   tbuf[0] = tbuf[1] = 0;
-  __bzero (schedule, sizeof (schedule));
+  bzero (schedule, sizeof (schedule));
 
   return (1);
 }

Signature · 1 line

2.7.3

Mike Frysinger

2016-04-17 16:17 UTC #1 lore raw

src/des_impl.c _des_crypt (char *buf, unsigned len, struct desparams *desp) · line 591

Quoted 13 lines · Felix Janda

Fixes compilation error with musl libc:
.libs/libtirpc_la-des_impl.o: In function `_des_crypt':
src/des_impl.c:591: undefined reference to `__bzero'
src/des_impl.c +1 -1
@@ -588,7 +588,7 @@ _des_crypt (char *buf, unsigned len, struct desparams *desp)
     }
   tin0 = tin1 = tout0 = tout1 = xor0 = xor1 = 0;
   tbuf[0] = tbuf[1] = 0;
-  __bzero (schedule, sizeof (schedule));
+  bzero (schedule, sizeof (schedule));

might as well convert to memset while you're at it since bzero is deprecated -mike

Felix Janda

author

2016-04-17 17:46 UTC #2 lore raw

PATCH v2 1/1 Replace bzero and __bzero by memset

Fixes in particular a compilation error with musl libc:

.libs/libtirpc_la-des_impl.o: In function `_des_crypt':
src/des_impl.c:591: undefined reference to `__bzero'

Signed-off-by Felix Janda <[email protected]>

---
 src/auth_time.c    | 2 +-
 src/des_impl.c     | 2 +-
 src/svc_auth_des.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

src/auth_time.c +1 -1

index 7f83ab4..210d251 100644
@@ -317,7 +317,7 @@ __rpc_get_time_offset(td, srv, thost, uaddr, netid)
 	sprintf(ipuaddr, "%d.%d.%d.%d.0.111", a1, a2, a3, a4);
 	useua = &ipuaddr[0];
 
-	bzero((char *)&sin, sizeof(sin));
+	memset((char *)&sin, 0, sizeof(sin));
 	if (uaddr_to_sockaddr(useua, &sin)) {
 		msg("unable to translate uaddr to sockaddr.");
 		if (needfree)

src/des_impl.c +1 -1

index 9dbccaf..15bec2a 100644
@@ -588,7 +588,7 @@ _des_crypt (char *buf, unsigned len, struct desparams *desp)
     }
   tin0 = tin1 = tout0 = tout1 = xor0 = xor1 = 0;
   tbuf[0] = tbuf[1] = 0;
-  __bzero (schedule, sizeof (schedule));
+  memset (schedule, 0, sizeof (schedule));
 
   return (1);
 }

src/svc_auth_des.c +1 -1

index 73de033..9235eea 100644
@@ -356,7 +356,7 @@ cache_init()
 
 	authdes_cache = (struct cache_entry *)
 		mem_alloc(sizeof(struct cache_entry) * AUTHDES_CACHESZ);	
-	bzero((char *)authdes_cache, 
+	memset((char *)authdes_cache, 0
 		sizeof(struct cache_entry) * AUTHDES_CACHESZ);
 
 	authdes_lru = (short *)mem_alloc(sizeof(short) * AUTHDES_CACHESZ);

Signature · 1 line

2.7.3