svn commit: branches/uClibc_0_9_29/libc/inet
vapier at uclibc.org
vapier at uclibc.org
Sat Jan 5 17:42:50 UTC 2008
Author: vapier
Date: 2008-01-05 09:42:50 -0800 (Sat, 05 Jan 2008)
New Revision: 20775
Log:
Merge r20097 by vapier from trunk:
do not check the pointer before freeing it since free(NULL) works just fine
Modified:
branches/uClibc_0_9_29/libc/inet/resolv.c
Changeset:
Modified: branches/uClibc_0_9_29/libc/inet/resolv.c
===================================================================
--- branches/uClibc_0_9_29/libc/inet/resolv.c 2008-01-05 17:39:56 UTC (rev 20774)
+++ branches/uClibc_0_9_29/libc/inet/resolv.c 2008-01-05 17:42:50 UTC (rev 20775)
@@ -1001,10 +1001,8 @@
fail:
if (fd != -1)
close(fd);
- if (lookup)
- free(lookup);
- if (packet)
- free(packet);
+ free(lookup);
+ free(packet);
h_errno = NETDB_INTERNAL;
/* Mess with globals while under lock */
if (local_ns != -1) {
@@ -1258,12 +1256,10 @@
if (a.atype == type) { /* CNAME*/
int len = MIN(anslen, i);
memcpy(answer, packet, len);
- if (packet)
- free(packet);
+ free(packet);
return(len);
}
- if (packet)
- free(packet);
+ free(packet);
return i;
}
libc_hidden_def(res_query)
More information about the uClibc-cvs
mailing list