Index: /trunk/src/kmk/kmk_cc_exec.c
===================================================================
--- /trunk/src/kmk/kmk_cc_exec.c	(revision 2771)
+++ /trunk/src/kmk/kmk_cc_exec.c	(revision 2772)
@@ -746,12 +746,10 @@
  * Emits a kKmkCcExpInstr_Return.
  *
- * @returns 0 on success, non-zero on failure.
  * @param   ppBlockTail         Pointer to the allocator tail pointer.
  */
-static int kmk_cc_exp_emit_return(PKMKCCBLOCK *ppBlockTail)
+static void kmk_cc_exp_emit_return(PKMKCCBLOCK *ppBlockTail)
 {
     PKMKCCEXPCORE pCore = kmk_cc_block_alloc_exp(ppBlockTail, sizeof(*pCore));
     pCore->enmOpCode = kKmkCcExpInstr_Return;
-    return 0;
 }
 
@@ -912,7 +910,7 @@
  * @param   cMaxArgs        Maximum number of arguments the function takes.
  */
-static int kmk_cc_exp_emit_plain_function(PKMKCCBLOCK *ppBlockTail, const char *pszFunction,
-                                          const char *pchArgs, uint32_t cchArgs, uint32_t cArgs, char chOpen, char chClose,
-                                          make_function_ptr_t pfnFunction, unsigned char cMaxArgs)
+static void kmk_cc_exp_emit_plain_function(PKMKCCBLOCK *ppBlockTail, const char *pszFunction,
+                                           const char *pchArgs, uint32_t cchArgs, uint32_t cArgs, char chOpen, char chClose,
+                                           make_function_ptr_t pfnFunction, unsigned char cMaxArgs)
 {
     uint32_t iArg;
@@ -977,5 +975,4 @@
     kmk_cc_block_realign(ppBlockTail);
     pInstr->Core.pNext = (PKMKCCEXPCORE)kmk_cc_block_get_next_ptr(*ppBlockTail);
-    return 0;
 }
 
@@ -1011,5 +1008,4 @@
  * kKmkCcExpInstr_SearchAndReplacePlainVariable instruction.
  *
- * @returns 0 on success, non-zero on failure.
  * @param   ppBlockTail         Pointer to the allocator tail pointer.
  * @param   pchName             The name of the variable.  (Does not need to be
@@ -1018,5 +1014,5 @@
  *                              nothing will be emitted.
  */
-static int kmk_cc_exp_emit_plain_variable_maybe_sr(PKMKCCBLOCK *ppBlockTail, const char *pchName, uint32_t cchName)
+static void kmk_cc_exp_emit_plain_variable_maybe_sr(PKMKCCBLOCK *ppBlockTail, const char *pchName, uint32_t cchName)
 {
     if (cchName > 0)
@@ -1100,5 +1096,4 @@
         }
     }
-    return 0;
 }
 
@@ -1107,5 +1102,4 @@
  * Emits a kKmkCcExpInstr_CopyString.
  *
- * @returns 0 on success, non-zero on failure.
  * @param   ppBlockTail         Pointer to the allocator tail pointer.
  * @param   pchStr              The string to emit (ASSUMED presistent thru-out
@@ -1114,5 +1108,5 @@
  *                              will be emitted.
  */
-static int kmk_cc_exp_emit_copy_string(PKMKCCBLOCK *ppBlockTail, const char *pchStr, uint32_t cchStr)
+static void kmk_cc_exp_emit_copy_string(PKMKCCBLOCK *ppBlockTail, const char *pchStr, uint32_t cchStr)
 {
     if (cchStr > 0)
@@ -1123,5 +1117,4 @@
         pInstr->pachSrc = pchStr;
     }
-    return 0;
 }
 
@@ -1161,7 +1154,5 @@
              * (kmk_cc_exp_emit_copy_string ignore zero length strings).
              */
-            rc = kmk_cc_exp_emit_copy_string(ppBlockTail, pchStr, offDollar + cDollars / 2);
-            if (rc != 0)
-                return rc;
+            kmk_cc_exp_emit_copy_string(ppBlockTail, pchStr, offDollar + cDollars / 2);
             pchStr += offDollar + cDollars;
             cchStr -= offDollar + cDollars;
@@ -1292,9 +1283,13 @@
                             }
                             if (!fExpandArgs || cDollars == 0)
-                                rc = kmk_cc_exp_emit_plain_function(ppBlockTail, pszFunction, pchStr, cchName,
-                                                                    cArgs, chOpen, chClose, pfnFunction, cMaxArgs);
+                                kmk_cc_exp_emit_plain_function(ppBlockTail, pszFunction, pchStr, cchName,
+                                                               cArgs, chOpen, chClose, pfnFunction, cMaxArgs);
                             else
+                            {
                                 rc = kmk_cc_exp_emit_dyn_function(ppBlockTail, pszFunction, pchStr, cchName,
                                                                   cArgs, chOpen, chClose, pfnFunction, cMaxArgs);
+                                if (rc != 0)
+                                    return rc;
+                            }
                         }
                         else
@@ -1358,7 +1353,11 @@
                             }
                             if (cDollars == 0)
-                                rc = kmk_cc_exp_emit_plain_variable_maybe_sr(ppBlockTail, pchStr, cchName);
+                                kmk_cc_exp_emit_plain_variable_maybe_sr(ppBlockTail, pchStr, cchName);
                             else
+                            {
                                 rc = kmk_cc_exp_emit_dyn_variable(ppBlockTail, pchStr, cchName);
+                                if (rc != 0)
+                                    return rc;
+                            }
                         }
                         pchStr += cchName + 1;
@@ -1368,10 +1367,8 @@
                     {
                         /* Single character variable name. */
-                        rc = kmk_cc_exp_emit_plain_variable_maybe_sr(ppBlockTail, pchStr, 1);
+                        kmk_cc_exp_emit_plain_variable_maybe_sr(ppBlockTail, pchStr, 1);
                         pchStr++;
                         cchStr--;
                     }
-                    if (rc != 0)
-                        return rc;
                 }
                 else
@@ -1387,7 +1384,5 @@
              * Nothing more to expand, the remainder is a simple string copy.
              */
-            rc = kmk_cc_exp_emit_copy_string(ppBlockTail, pchStr, cchStr);
-            if (rc != 0)
-                return rc;
+            kmk_cc_exp_emit_copy_string(ppBlockTail, pchStr, cchStr);
             break;
         }
@@ -1397,5 +1392,6 @@
      * Emit final instruction.
      */
-    return kmk_cc_exp_emit_return(ppBlockTail);
+    kmk_cc_exp_emit_return(ppBlockTail);
+    return 0;
 }