From 949a8d0b46d6baa9f42c2f8c3bd5e3bdc3596cbd Mon Sep 17 00:00:00 2001
From: m0gg
Date: Sun, 19 Nov 2006 09:40:14 +0000
Subject: nanohttp admin patch; code cleanup

---
 libcsoap/soap-service.c | 72 ++++++++++++++++++++++++++-----------------------
 1 file changed, 39 insertions(+), 33 deletions(-)

(limited to 'libcsoap/soap-service.c')

diff --git a/libcsoap/soap-service.c b/libcsoap/soap-service.c
index e2a486a..dc3a2a5 100644
--- a/libcsoap/soap-service.c
+++ b/libcsoap/soap-service.c
@@ -1,5 +1,5 @@
 /******************************************************************
-*  $Id: soap-service.c,v 1.8 2006/07/09 16:24:19 snowdrop Exp $
+*  $Id: soap-service.c,v 1.9 2006/11/19 09:40:14 m0gg Exp $
 *
 * CSOAP Project:  A SOAP client/server library in C
 * Copyright (C) 2003  Ferhat Ayaz
@@ -25,12 +25,27 @@
 #include <config.h>
 #endif
 
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
+#ifdef HAVE_STDIO_H
+#include <stdio.h>
+#endif
+
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
 
-#include <nanohttp/nanohttp-logging.h>
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+
 #include <nanohttp/nanohttp-common.h>
+#include <nanohttp/nanohttp-socket.h>
+#include <nanohttp/nanohttp-stream.h>
+#include <nanohttp/nanohttp-request.h>
+#include <nanohttp/nanohttp-logging.h>
 
 #include "soap-service.h"
 
@@ -39,66 +54,57 @@ soap_service_node_new(SoapService * service, SoapServiceNode * next)
 {
   SoapServiceNode *node;
 
-  node = (SoapServiceNode *) malloc(sizeof(SoapServiceNode));
+  if (!(node = (SoapServiceNode *) malloc(sizeof(SoapServiceNode)))) {
+
+    log_error2("malloc failed (%s)", strerror(errno));
+    return NULL;
+  }
   node->service = service;
   node->next = next;
 
   return node;
 }
 
-
-
-
 SoapService *
 soap_service_new(const char *urn, const char *method, SoapServiceFunc f)
 {
   SoapService *service;
 
+  if (!(service = (SoapService *) malloc(sizeof(SoapService)))) {
+
+    log_error2("malloc failed (%s)", strerror(errno));
+    return NULL;
+  }
 
-  service = (SoapService *) malloc(sizeof(SoapService));
   service->func = f;
 
-  if (urn != NULL)
-  {
-    service->urn = (char *) malloc(strlen(urn) + 1);
-    strcpy(service->urn, urn);
-  }
-  else
-  {
+  if (urn == NULL) {
+
     log_warn1("urn is NULL");
-    service->urn = "";
+    urn = "";
   }
+  service->urn = strdup(urn);
+
+  if (method == NULL) {
 
-  if (method != NULL)
-  {
-    service->method = (char *) malloc(strlen(method) + 1);
-    strcpy(service->method, method);
-  }
-  else
-  {
     log_warn1("method is NULL");
-    service->method = "";
+    method = "";
   }
+  service->method = strdup(method);
 
   return service;
 }
 
-
-
 void
 soap_service_free(SoapService * service)
 {
-  log_verbose2("enter: service=%p", service);
-
   if (service == NULL)
     return;
 
-  if (strcmp(service->urn, ""))
-    free(service->urn);
-
-  if (strcmp(service->method, ""))
-    free(service->method);
+  free(service->urn);
+  free(service->method);
 
   free(service);
-  log_verbose1("leave with success");
+
+  return;
 }
-- 
cgit v1.1-32-gdbae