Fossil SCM
Minor optimization and refactoring.
Commit
b2049d643b6a3a3a10b9e7cdda266f4da8837ee525eda4cfb5fa8ea1dc0b76c7
Parent
b75a9d0fa383b57…
1 file changed
+11
-10
+11
-10
| --- src/tkt.c | ||
| +++ src/tkt.c | ||
| @@ -1235,11 +1235,13 @@ | ||
| 1235 | 1235 | if( P("raw")!=0 ){ |
| 1236 | 1236 | @ <h2>Raw Artifacts Associated With Ticket %h(zUuid)</h2> |
| 1237 | 1237 | }else{ |
| 1238 | 1238 | @ <h2>Artifacts Associated With Ticket %h(zUuid)</h2> |
| 1239 | 1239 | getAllTicketFields(); |
| 1240 | - aLastVal = blobarray_new(nField); | |
| 1240 | + if( nTicketBslns ){ | |
| 1241 | + aLastVal = blobarray_new(nField); | |
| 1242 | + } | |
| 1241 | 1243 | } |
| 1242 | 1244 | db_prepare(&q, |
| 1243 | 1245 | "SELECT datetime(mtime,toLocal()), objid, uuid, NULL, NULL, NULL" |
| 1244 | 1246 | " FROM event, blob" |
| 1245 | 1247 | " WHERE objid IN (SELECT rid FROM tagxref WHERE tagid=%d)" |
| @@ -1375,22 +1377,21 @@ | ||
| 1375 | 1377 | text_diff(prev, &val, &d, &DCfg); |
| 1376 | 1378 | @ %h(zX) changed as: |
| 1377 | 1379 | @ %s(blob_str(&d)) |
| 1378 | 1380 | @ </li> |
| 1379 | 1381 | blob_reset(&d); |
| 1380 | - }else if( bLong ){ | |
| 1382 | + }else{ | |
| 1381 | 1383 | if( bRegular ){ |
| 1382 | 1384 | @ %h(zX) changed to: |
| 1383 | 1385 | } |
| 1384 | - @ <blockquote><pre class='verbatim'> | |
| 1385 | - @ %h(zValue) | |
| 1386 | - @ </pre></blockquote></li> | |
| 1387 | - }else{ | |
| 1388 | - if( bRegular ){ | |
| 1389 | - @ %h(zX) changed to: \ | |
| 1390 | - } | |
| 1391 | - @ "%h(zValue)"</li> | |
| 1386 | + if( bLong ){ | |
| 1387 | + @ <blockquote><pre class='verbatim'> | |
| 1388 | + @ %h(zValue) | |
| 1389 | + @ </pre></blockquote></li> | |
| 1390 | + }else{ | |
| 1391 | + @ "%h(zValue)"</li> | |
| 1392 | + } | |
| 1392 | 1393 | } |
| 1393 | 1394 | if( blob_buffer(prev) && blob_size(prev) && !bAppend ){ |
| 1394 | 1395 | blob_truncate(prev,0); |
| 1395 | 1396 | } |
| 1396 | 1397 | if( nValue ) blob_appendb(prev, &val); |
| 1397 | 1398 |
| --- src/tkt.c | |
| +++ src/tkt.c | |
| @@ -1235,11 +1235,13 @@ | |
| 1235 | if( P("raw")!=0 ){ |
| 1236 | @ <h2>Raw Artifacts Associated With Ticket %h(zUuid)</h2> |
| 1237 | }else{ |
| 1238 | @ <h2>Artifacts Associated With Ticket %h(zUuid)</h2> |
| 1239 | getAllTicketFields(); |
| 1240 | aLastVal = blobarray_new(nField); |
| 1241 | } |
| 1242 | db_prepare(&q, |
| 1243 | "SELECT datetime(mtime,toLocal()), objid, uuid, NULL, NULL, NULL" |
| 1244 | " FROM event, blob" |
| 1245 | " WHERE objid IN (SELECT rid FROM tagxref WHERE tagid=%d)" |
| @@ -1375,22 +1377,21 @@ | |
| 1375 | text_diff(prev, &val, &d, &DCfg); |
| 1376 | @ %h(zX) changed as: |
| 1377 | @ %s(blob_str(&d)) |
| 1378 | @ </li> |
| 1379 | blob_reset(&d); |
| 1380 | }else if( bLong ){ |
| 1381 | if( bRegular ){ |
| 1382 | @ %h(zX) changed to: |
| 1383 | } |
| 1384 | @ <blockquote><pre class='verbatim'> |
| 1385 | @ %h(zValue) |
| 1386 | @ </pre></blockquote></li> |
| 1387 | }else{ |
| 1388 | if( bRegular ){ |
| 1389 | @ %h(zX) changed to: \ |
| 1390 | } |
| 1391 | @ "%h(zValue)"</li> |
| 1392 | } |
| 1393 | if( blob_buffer(prev) && blob_size(prev) && !bAppend ){ |
| 1394 | blob_truncate(prev,0); |
| 1395 | } |
| 1396 | if( nValue ) blob_appendb(prev, &val); |
| 1397 |
| --- src/tkt.c | |
| +++ src/tkt.c | |
| @@ -1235,11 +1235,13 @@ | |
| 1235 | if( P("raw")!=0 ){ |
| 1236 | @ <h2>Raw Artifacts Associated With Ticket %h(zUuid)</h2> |
| 1237 | }else{ |
| 1238 | @ <h2>Artifacts Associated With Ticket %h(zUuid)</h2> |
| 1239 | getAllTicketFields(); |
| 1240 | if( nTicketBslns ){ |
| 1241 | aLastVal = blobarray_new(nField); |
| 1242 | } |
| 1243 | } |
| 1244 | db_prepare(&q, |
| 1245 | "SELECT datetime(mtime,toLocal()), objid, uuid, NULL, NULL, NULL" |
| 1246 | " FROM event, blob" |
| 1247 | " WHERE objid IN (SELECT rid FROM tagxref WHERE tagid=%d)" |
| @@ -1375,22 +1377,21 @@ | |
| 1377 | text_diff(prev, &val, &d, &DCfg); |
| 1378 | @ %h(zX) changed as: |
| 1379 | @ %s(blob_str(&d)) |
| 1380 | @ </li> |
| 1381 | blob_reset(&d); |
| 1382 | }else{ |
| 1383 | if( bRegular ){ |
| 1384 | @ %h(zX) changed to: |
| 1385 | } |
| 1386 | if( bLong ){ |
| 1387 | @ <blockquote><pre class='verbatim'> |
| 1388 | @ %h(zValue) |
| 1389 | @ </pre></blockquote></li> |
| 1390 | }else{ |
| 1391 | @ "%h(zValue)"</li> |
| 1392 | } |
| 1393 | } |
| 1394 | if( blob_buffer(prev) && blob_size(prev) && !bAppend ){ |
| 1395 | blob_truncate(prev,0); |
| 1396 | } |
| 1397 | if( nValue ) blob_appendb(prev, &val); |
| 1398 |