Changeset 8436 for trunk/module-webif-lib.c

Timestamp:

02/27/13 14:34:41 (9 years ago)

Author:

gf

Message:

webif: Simplify template loading and checking.

The subdir logic seems to complicate the code for no good reason and
as far as I can work out it does nothing. It looks like a leftover
that can be removed.

File:

• trunk/module-webif-lib.c (modified) (2 diffs)

trunk/module-webif-lib.c

@@ -387 +387 @@
             char* separator = "/* External CSS */";
             char* oldallocated = allocated;
-            CSS = tpl_getUnparsedTpl("CSS", 1, "");
+            CSS = tpl_getUnparsedTpl("CSS");
             int32_t newsize = strlen(CSS) + strlen(separator) + 2;
             if (oldallocated) newsize += strlen(oldallocated) + 1;
@@ -404 +404 @@
 
     } else {
-        CSS = tpl_getUnparsedTpl("CSS", 1, "");
-        JSCRIPT = tpl_getUnparsedTpl("JSCRIPT", 1, "");
+        CSS = tpl_getUnparsedTpl("CSS");
+        JSCRIPT = tpl_getUnparsedTpl("JSCRIPT");
 #ifdef TOUCH
-        TOUCH_CSS = tpl_getUnparsedTpl("TOUCH_CSS", 1, "");
-        TOUCH_JSCRIPT = tpl_getUnparsedTpl("TOUCH_JSCRIPT", 1, "");
+        TOUCH_CSS = tpl_getUnparsedTpl("TOUCH_CSS");
+        TOUCH_JSCRIPT = tpl_getUnparsedTpl("TOUCH_JSCRIPT");
         char* res_tpl = !subdir || strcmp(subdir, TOUCH_SUBDIR)
             ? (filen == 1 ? CSS : JSCRIPT)