Changeset 87 in libcf

Timestamp:

05/11/13 00:42:10 (11 years ago)

Author:

cheese

Message:

#1 ..arrange some DIFFICULT ternary operators

Location:

trunk/src

Files:

• cf_debug.c (modified) (3 diffs)
• cf_log.c (modified) (3 diffs)
• cf_socket.c (modified) (1 diff)

trunk/src/cf_debug.c

@@ -125 +125 @@
         {
             if (i+j < len)
-                fprintf (fp, "%c", IS_READABLE_CHAR(bin[i+j]) ? bin[i+j] : '.');
+                fprintf (fp, "%c", IS_READABLE_CHAR (bin[i+j]) ? bin[i+j] : '.');
         }
         fprintf (fp, "\n");
@@ -229 +229 @@
     push->line = line;
     push->caller = context->callstack.caller;
-    push->frameIndex = push->caller == NULL
-                     ? 0
-                     : push->caller->frameIndex + 1;
+    push->frameIndex = (push->caller) ? push->caller->frameIndex + 1 : 0;
     context->callstack.caller = push;
 
@@ -481 +479 @@
         ; callstack = callstack->caller)
     {
-        fprintf (fp == NULL ? stderr : fp,
-                 "#%-4d %s <%s:%d>\n",
-                 iter++,
-                 callstack->func,
-                 callstack->file,
-                 callstack->line);
-    }
-
-    return CF_OK;
-}
+        fprintf (fp, "#%-4d %s <%s:%d>\n",
+                     iter++,
+                     callstack->func,
+                     callstack->file,
+                     callstack->line);
+    }
+
+    return CF_OK;
+}

trunk/src/cf_log.c

@@ -394 +394 @@
              ? LOG_BUFFER_DEFAULT_SIZE
              : memsize;
+
     CF_LOG_CTX  * context = NULL;
 
@@ -426 +427 @@
             context->size = (size_t) size;
         }
+
+        *ctx = (CF_Log_Ctx) context;
     }
     CATCH_IF (result < 0)
     {
         CF_Log_DestroyCtx ((CF_Log_Ctx) context);
-        return result;
-    }
-
-    *ctx = (CF_Log_Ctx) context;
+    }
 
     return CF_OK;
@@ -674 +674 @@
         return result;
 
-    result = (flag == CF_TRUE)
-           ? CF_Log_SetMultiThread (ctx)
-           : CF_Log_UnsetMultiThread (ctx);
+    if (flag)
+        result = CF_Log_SetMultiThread (ctx);
+    else
+        result = CF_Log_UnsetMultiThread (ctx);
 
     return result;

trunk/src/cf_socket.c

@@ -58 +58 @@
 {
 #if defined(_WIN32) || defined(_WIN64)
-    unsigned long mode = (boolean == CF_TRUE) ? 1 : 0;
+    unsigned long mode = (boolean) ? 1 : 0;
     ioctlsocket (sock, FIONBIO, &mode);
 #else