Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/module-webif-lib.c

    r8421 r8436  
    387387            char* separator = "/* External CSS */";
    388388            char* oldallocated = allocated;
    389             CSS = tpl_getUnparsedTpl("CSS", 1, "");
     389            CSS = tpl_getUnparsedTpl("CSS");
    390390            int32_t newsize = strlen(CSS) + strlen(separator) + 2;
    391391            if (oldallocated) newsize += strlen(oldallocated) + 1;
     
    404404
    405405    } else {
    406         CSS = tpl_getUnparsedTpl("CSS", 1, "");
    407         JSCRIPT = tpl_getUnparsedTpl("JSCRIPT", 1, "");
     406        CSS = tpl_getUnparsedTpl("CSS");
     407        JSCRIPT = tpl_getUnparsedTpl("JSCRIPT");
    408408#ifdef TOUCH
    409         TOUCH_CSS = tpl_getUnparsedTpl("TOUCH_CSS", 1, "");
    410         TOUCH_JSCRIPT = tpl_getUnparsedTpl("TOUCH_JSCRIPT", 1, "");
     409        TOUCH_CSS = tpl_getUnparsedTpl("TOUCH_CSS");
     410        TOUCH_JSCRIPT = tpl_getUnparsedTpl("TOUCH_JSCRIPT");
    411411        char* res_tpl = !subdir || strcmp(subdir, TOUCH_SUBDIR)
    412412            ? (filen == 1 ? CSS : JSCRIPT)
Note: See TracChangeset for help on using the changeset viewer.