Fossil SCM
A pikchr error output formatting fix, per [forum:e167e2e622|forum post e167e2e622], and an unrelated typo fix.
Commit
c440011b74eb591d463707c30f3647694446b24a4bbc88bd1c55e89038541d3d
Parent
9f53093dca13c13…
2 files changed
+1
-1
+2
-2
+1
-1
| --- src/pivot.c | ||
| +++ src/pivot.c | ||
| @@ -62,11 +62,11 @@ | ||
| 62 | 62 | ** Set a secondary file. The primary file must be set first. There |
| 63 | 63 | ** must be at least one secondary but there can be more than one if |
| 64 | 64 | ** desired. |
| 65 | 65 | */ |
| 66 | 66 | void pivot_set_secondary(int rid){ |
| 67 | - /* Insert the primary record */ | |
| 67 | + /* Insert the secondary record */ | |
| 68 | 68 | db_multi_exec( |
| 69 | 69 | "INSERT OR IGNORE INTO aqueue(rid, mtime, pending, src)" |
| 70 | 70 | " SELECT %d, mtime, 1, 0 FROM event WHERE objid=%d AND type='ci'", |
| 71 | 71 | rid, rid |
| 72 | 72 | ); |
| 73 | 73 |
| --- src/pivot.c | |
| +++ src/pivot.c | |
| @@ -62,11 +62,11 @@ | |
| 62 | ** Set a secondary file. The primary file must be set first. There |
| 63 | ** must be at least one secondary but there can be more than one if |
| 64 | ** desired. |
| 65 | */ |
| 66 | void pivot_set_secondary(int rid){ |
| 67 | /* Insert the primary record */ |
| 68 | db_multi_exec( |
| 69 | "INSERT OR IGNORE INTO aqueue(rid, mtime, pending, src)" |
| 70 | " SELECT %d, mtime, 1, 0 FROM event WHERE objid=%d AND type='ci'", |
| 71 | rid, rid |
| 72 | ); |
| 73 |
| --- src/pivot.c | |
| +++ src/pivot.c | |
| @@ -62,11 +62,11 @@ | |
| 62 | ** Set a secondary file. The primary file must be set first. There |
| 63 | ** must be at least one secondary but there can be more than one if |
| 64 | ** desired. |
| 65 | */ |
| 66 | void pivot_set_secondary(int rid){ |
| 67 | /* Insert the secondary record */ |
| 68 | db_multi_exec( |
| 69 | "INSERT OR IGNORE INTO aqueue(rid, mtime, pending, src)" |
| 70 | " SELECT %d, mtime, 1, 0 FROM event WHERE objid=%d AND type='ci'", |
| 71 | rid, rid |
| 72 | ); |
| 73 |
+2
-2
| --- src/wiki.c | ||
| +++ src/wiki.c | ||
| @@ -211,12 +211,12 @@ | ||
| 211 | 211 | if( w>0 ){ |
| 212 | 212 | @ <div class="pikchr-svg" style="max-width:%d(w)px"> |
| 213 | 213 | @ %s(zOut) |
| 214 | 214 | @ </div> |
| 215 | 215 | }else{ |
| 216 | - @ <pre class='error'>\n"> | |
| 217 | - @ %s(zOut); | |
| 216 | + @ <pre class='error'> | |
| 217 | + @ %h(zOut) | |
| 218 | 218 | @ </pre> |
| 219 | 219 | } |
| 220 | 220 | free(zOut); |
| 221 | 221 | }else{ |
| 222 | 222 | @ <pre class='textPlain'> |
| 223 | 223 |
| --- src/wiki.c | |
| +++ src/wiki.c | |
| @@ -211,12 +211,12 @@ | |
| 211 | if( w>0 ){ |
| 212 | @ <div class="pikchr-svg" style="max-width:%d(w)px"> |
| 213 | @ %s(zOut) |
| 214 | @ </div> |
| 215 | }else{ |
| 216 | @ <pre class='error'>\n"> |
| 217 | @ %s(zOut); |
| 218 | @ </pre> |
| 219 | } |
| 220 | free(zOut); |
| 221 | }else{ |
| 222 | @ <pre class='textPlain'> |
| 223 |
| --- src/wiki.c | |
| +++ src/wiki.c | |
| @@ -211,12 +211,12 @@ | |
| 211 | if( w>0 ){ |
| 212 | @ <div class="pikchr-svg" style="max-width:%d(w)px"> |
| 213 | @ %s(zOut) |
| 214 | @ </div> |
| 215 | }else{ |
| 216 | @ <pre class='error'> |
| 217 | @ %h(zOut) |
| 218 | @ </pre> |
| 219 | } |
| 220 | free(zOut); |
| 221 | }else{ |
| 222 | @ <pre class='textPlain'> |
| 223 |