Переглянути джерело

use calloc instead of malloc/memset

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
Thomas Guillem 10 роки тому
батько
коміт
e137e0f787
4 змінених файлів з 5 додано та 10 видалено
  1. 1 2
      src/netbios_ns_entry.c
  2. 2 4
      src/netbios_query.c
  3. 1 2
      src/netbios_session.c
  4. 1 2
      src/smb_session.c

+ 1 - 2
src/netbios_ns_entry.c

@@ -66,9 +66,8 @@ netbios_ns_entry *netbios_ns_entry_add(netbios_ns *ns, const char *name,
 {
     netbios_ns_entry  *entry;
 
-    entry = malloc(sizeof(netbios_ns_entry));
+    entry = calloc(1, sizeof(netbios_ns_entry));
     assert(entry != NULL);
-    memset((void *)entry, 0, sizeof(netbios_ns_entry));
 
     if (name != NULL)
     {

+ 2 - 4
src/netbios_query.c

@@ -29,13 +29,11 @@ netbios_query   *netbios_query_new(size_t payload_size,
 {
     netbios_query *q;
 
-    q = malloc(sizeof(netbios_query));
+    q = calloc(1, sizeof(netbios_query));
     assert(q);
-    memset((void *)q, 0, sizeof(netbios_query));
 
-    q->packet = malloc(sizeof(netbios_query_packet) + payload_size);
+    q->packet = calloc(1, sizeof(netbios_query_packet) + payload_size);
     assert(q->packet);
-    memset((void *)q->packet, 0, sizeof(netbios_query_packet) + payload_size);
 
     q->payload_size = payload_size;
 

+ 1 - 2
src/netbios_session.c

@@ -68,9 +68,8 @@ netbios_session *netbios_session_new(size_t buf_size)
     netbios_session   *session;
     size_t            packet_size;
 
-    session = (netbios_session *)malloc(sizeof(netbios_session));
+    session = (netbios_session *)calloc(1, sizeof(netbios_session));
     assert(session != NULL);
-    memset((void *) session, 0, sizeof(netbios_session));
 
     session->packet_payload_size = buf_size;
     packet_size = sizeof(netbios_session_packet) + session->packet_payload_size;

+ 1 - 2
src/smb_session.c

@@ -35,9 +35,8 @@ smb_session   *smb_session_new()
 {
     smb_session *s;
 
-    s = malloc(sizeof(smb_session));
+    s = calloc(1, sizeof(smb_session));
     assert(s != NULL);
-    memset((void *)s, 0, sizeof(smb_session));
 
     s->guest              = false;