Fossil SCM
Minor efficiency hack in style_emit_script_builtin() and swapped a potentially problematic ordering of two JS includes.
Commit
c60ad868b41266c39dd5599458ae5828236c0e455b32814beebb04c566d1feec
Parent
ee175636aa9a886…
2 files changed
+1
-1
+6
-5
+1
-1
| --- src/fileedit.c | ||
| +++ src/fileedit.c | ||
| @@ -1867,12 +1867,12 @@ | ||
| 1867 | 1867 | blob_reset(&err); |
| 1868 | 1868 | CheckinMiniInfo_cleanup(&cimi); |
| 1869 | 1869 | style_emit_script_fossil_bootstrap(0); |
| 1870 | 1870 | style_emit_script_fetch(0); |
| 1871 | 1871 | style_emit_script_tabs(0); |
| 1872 | - style_emit_script_builtin(0, "fossil.page.fileedit.js"); | |
| 1873 | 1872 | style_emit_script_confirmer(0); |
| 1873 | + style_emit_script_builtin(0, "fossil.page.fileedit.js"); | |
| 1874 | 1874 | if(blob_size(&endScript)>0){ |
| 1875 | 1875 | style_emit_script_tag(0,0); |
| 1876 | 1876 | CX("(function(){\n"); |
| 1877 | 1877 | CX("try{\n%b\n}" |
| 1878 | 1878 | "catch(e){" |
| 1879 | 1879 |
| --- src/fileedit.c | |
| +++ src/fileedit.c | |
| @@ -1867,12 +1867,12 @@ | |
| 1867 | blob_reset(&err); |
| 1868 | CheckinMiniInfo_cleanup(&cimi); |
| 1869 | style_emit_script_fossil_bootstrap(0); |
| 1870 | style_emit_script_fetch(0); |
| 1871 | style_emit_script_tabs(0); |
| 1872 | style_emit_script_builtin(0, "fossil.page.fileedit.js"); |
| 1873 | style_emit_script_confirmer(0); |
| 1874 | if(blob_size(&endScript)>0){ |
| 1875 | style_emit_script_tag(0,0); |
| 1876 | CX("(function(){\n"); |
| 1877 | CX("try{\n%b\n}" |
| 1878 | "catch(e){" |
| 1879 |
| --- src/fileedit.c | |
| +++ src/fileedit.c | |
| @@ -1867,12 +1867,12 @@ | |
| 1867 | blob_reset(&err); |
| 1868 | CheckinMiniInfo_cleanup(&cimi); |
| 1869 | style_emit_script_fossil_bootstrap(0); |
| 1870 | style_emit_script_fetch(0); |
| 1871 | style_emit_script_tabs(0); |
| 1872 | style_emit_script_confirmer(0); |
| 1873 | style_emit_script_builtin(0, "fossil.page.fileedit.js"); |
| 1874 | if(blob_size(&endScript)>0){ |
| 1875 | style_emit_script_tag(0,0); |
| 1876 | CX("(function(){\n"); |
| 1877 | CX("try{\n%b\n}" |
| 1878 | "catch(e){" |
| 1879 |
+6
-5
| --- src/style.c | ||
| +++ src/style.c | ||
| @@ -1586,21 +1586,22 @@ | ||
| 1586 | 1586 | if(asInline){ |
| 1587 | 1587 | style_emit_script_tag(0,0); |
| 1588 | 1588 | CX("%s", builtin_text(zName)); |
| 1589 | 1589 | style_emit_script_tag(1,0); |
| 1590 | 1590 | }else{ |
| 1591 | - char * zFull = mprintf("builtin/%s",zName); | |
| 1592 | - const char * zBuiltin = builtin_text(zName); | |
| 1591 | + char * zFullName = mprintf("builtin/%s",zName); | |
| 1592 | + int nLen = 0; | |
| 1593 | + const char * zBuiltin = (const char *)builtin_file(zName, &nLen); | |
| 1593 | 1594 | const char * zHash = 0; |
| 1594 | 1595 | if(zBuiltin!=0){ |
| 1595 | 1596 | md5sum_init(); |
| 1596 | - md5sum_step_text(zBuiltin,-1); | |
| 1597 | + md5sum_step_text(zBuiltin,nLen); | |
| 1597 | 1598 | zHash = md5sum_finish(0); |
| 1598 | 1599 | } |
| 1599 | - CX("<script src='%R/%T?cache=%.8s'></script>\n",zFull, | |
| 1600 | + CX("<script src='%R/%T?cache=%.8s'></script>\n",zFullName, | |
| 1600 | 1601 | zHash ? zHash : "MISSING"); |
| 1601 | - fossil_free(zFull); | |
| 1602 | + fossil_free(zFullName); | |
| 1602 | 1603 | } |
| 1603 | 1604 | } |
| 1604 | 1605 | |
| 1605 | 1606 | /* |
| 1606 | 1607 | ** The first time this is called it emits the JS code from the |
| 1607 | 1608 |
| --- src/style.c | |
| +++ src/style.c | |
| @@ -1586,21 +1586,22 @@ | |
| 1586 | if(asInline){ |
| 1587 | style_emit_script_tag(0,0); |
| 1588 | CX("%s", builtin_text(zName)); |
| 1589 | style_emit_script_tag(1,0); |
| 1590 | }else{ |
| 1591 | char * zFull = mprintf("builtin/%s",zName); |
| 1592 | const char * zBuiltin = builtin_text(zName); |
| 1593 | const char * zHash = 0; |
| 1594 | if(zBuiltin!=0){ |
| 1595 | md5sum_init(); |
| 1596 | md5sum_step_text(zBuiltin,-1); |
| 1597 | zHash = md5sum_finish(0); |
| 1598 | } |
| 1599 | CX("<script src='%R/%T?cache=%.8s'></script>\n",zFull, |
| 1600 | zHash ? zHash : "MISSING"); |
| 1601 | fossil_free(zFull); |
| 1602 | } |
| 1603 | } |
| 1604 | |
| 1605 | /* |
| 1606 | ** The first time this is called it emits the JS code from the |
| 1607 |
| --- src/style.c | |
| +++ src/style.c | |
| @@ -1586,21 +1586,22 @@ | |
| 1586 | if(asInline){ |
| 1587 | style_emit_script_tag(0,0); |
| 1588 | CX("%s", builtin_text(zName)); |
| 1589 | style_emit_script_tag(1,0); |
| 1590 | }else{ |
| 1591 | char * zFullName = mprintf("builtin/%s",zName); |
| 1592 | int nLen = 0; |
| 1593 | const char * zBuiltin = (const char *)builtin_file(zName, &nLen); |
| 1594 | const char * zHash = 0; |
| 1595 | if(zBuiltin!=0){ |
| 1596 | md5sum_init(); |
| 1597 | md5sum_step_text(zBuiltin,nLen); |
| 1598 | zHash = md5sum_finish(0); |
| 1599 | } |
| 1600 | CX("<script src='%R/%T?cache=%.8s'></script>\n",zFullName, |
| 1601 | zHash ? zHash : "MISSING"); |
| 1602 | fossil_free(zFullName); |
| 1603 | } |
| 1604 | } |
| 1605 | |
| 1606 | /* |
| 1607 | ** The first time this is called it emits the JS code from the |
| 1608 |