- config.c, libopm.c: remove a series of NULL/0 assignments not needed with calloc()

git-svn-id: svn://svn.ircd-hybrid.org/svnroot/hopm/branches/1.0.x@5914 82007160-df01-0410-b94d-b575c5fd34c7

diff --git a/src/libopm/src/config.c b/src/libopm/src/config.c
index 7fc8be8be7c2b50718a27e4e294788cfc3d55742..5b6c07d95ab8784ad738a0acc2fb1f064f2329a5 100644 (file)
--- a/src/libopm/src/config.c
+++ b/src/libopm/src/config.c
@@ -83,7 +83,6 @@ libopm_config_create(void)
     {
       case OPM_TYPE_INT:
         ret->vars[i] = xcalloc(sizeof(int));
-        *(int *)ret->vars[i] = 0;
         break;
 
       case OPM_TYPE_STRING:
@@ -97,6 +96,7 @@ libopm_config_create(void)
       case OPM_TYPE_STRINGLIST:
         ret->vars[i] = libopm_list_create();
         break;
+
       default:
         ret->vars[i] = NULL;
     }

diff --git a/src/libopm/src/libopm.c b/src/libopm/src/libopm.c
index 4e6f8d8263b0ae8a7e64a9cf9c3a148403452408..c9908d683d579e057a8cd7934977e7a815455409 100644 (file)
--- a/src/libopm/src/libopm.c
+++ b/src/libopm/src/libopm.c
@@ -114,17 +114,10 @@ opm_create(void)
   ret->scans = libopm_list_create();
   ret->queue = libopm_list_create();
   ret->protocols = libopm_list_create();
-  ret->fd_use = 0;
 
   /* Setup callbacks */
   ret->callbacks = xcalloc(sizeof(OPM_CALLBACK_T) * CBLEN);
 
-  for (i = 0; i < CBLEN; i++)
-  {
-    ret->callbacks[i].func = NULL;
-    ret->callbacks[i].data = NULL;
-  }
-
   return ret;
 }
 
@@ -686,14 +679,7 @@ libopm_connection_create(void)
   OPM_CONNECTION_T *ret;
 
   ret = xcalloc(sizeof *ret);
-
-  ret->fd         = 0;
-  ret->bytes_read = 0;
-  ret->readlen    = 0;
-  ret->protocol   = 0;
-  ret->port       = 0;
-
-  ret->state      = OPM_STATE_UNESTABLISHED;
+  ret->state = OPM_STATE_UNESTABLISHED;
 
   return ret;
 }