diff libnnchat.c @ 78:745f670068dc

Add functions to simplify code.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 18 Dec 2008 14:34:44 +0200
parents fe5fc76c0806
children e36df57c5b0f
line wrap: on
line diff
--- a/libnnchat.c	Sat Dec 13 11:19:19 2008 +0200
+++ b/libnnchat.c	Thu Dec 18 14:34:44 2008 +0200
@@ -97,7 +97,7 @@
 {
     size_t tmpLen;
     
-    if (!str) return FALSE;
+    if (str == NULL) return FALSE;
     tmpLen = strlen(str);
     
     if ((*pos + tmpLen) >= *size && !bufRealloc(buf, size, tmpLen + SET_ALLOC_SIZE))
@@ -115,7 +115,7 @@
     char *result;
     size_t resSize, resPos = 0;
     
-    if (!str) return NULL;
+    if (str == NULL) return NULL;
     
     resSize = strlen(str) + SET_ALLOC_SIZE;
     if ((result = th_malloc(resSize)) == NULL)
@@ -170,7 +170,7 @@
     size_t resSize, resPos = 0;
     int c;
     
-    if (!str) return NULL;
+    if (str == NULL) return NULL;
     
     resSize = strlen(str) + SET_ALLOC_SIZE;
     if ((result = th_malloc(resSize)) == NULL)
@@ -231,7 +231,7 @@
     char *result;
     size_t resSize, resPos = 0;
     
-    if (!str) return NULL;
+    if (str == NULL) return NULL;
     
     resSize = strlen(str) + SET_ALLOC_SIZE;
     if ((result = th_malloc(resSize)) == NULL)
@@ -256,7 +256,7 @@
     char *result;
     size_t resSize, resPos = 0;
     
-    if (!str) return NULL;
+    if (str == NULL) return NULL;
     
     resSize = strlen(str) + SET_ALLOC_SIZE;
     if ((result = th_malloc(resSize)) == NULL)
@@ -287,7 +287,7 @@
     char *result;
     size_t resSize, resPos = 0;
     
-    if (!str) return NULL;
+    if (str == NULL) return NULL;
     
     resSize = strlen(str);
     if ((result = th_malloc(resSize)) == NULL)
@@ -317,6 +317,34 @@
 }
 
 
+char *doubleDecodeStr(const char *str)
+{
+    char *res, *tmp;
+    
+    if ((tmp = decodeStr1(str)) == NULL)
+        return NULL;
+    
+    res = decodeStr2(tmp);
+    th_free(tmp);
+    
+    return res;    
+}
+
+
+char *doubleEncodeStr(const char *str)
+{
+    char *res, *tmp;
+    
+    if ((tmp = encodeStr2(str)) == NULL)
+        return NULL;
+    
+    res = encodeStr1(tmp);
+    th_free(tmp);
+    
+    return res;    
+}
+
+
 BOOL sendUserMsg(const int sock, const char *user, const char *fmt, ...)
 {
     char tmpBuf[SET_BUFSIZE], tmpBuf2[SET_BUFSIZE + 256];