Fossil SCM
Change a few %s format letters into %h.
Commit
8e27a5a084a55f1831ec4e17b2de48b5ec99e7a04dc6dc3037c44fe9773569b1
Parent
db482f1675d5d08…
3 files changed
+1
-1
+1
-1
+1
-1
+1
-1
| --- src/login.c | ||
| +++ src/login.c | ||
| @@ -1458,11 +1458,11 @@ | ||
| 1458 | 1458 | |
| 1459 | 1459 | if( db_exists("SELECT 1 FROM user WHERE login=%B", &login) ){ |
| 1460 | 1460 | /* Here lies the reason I don't use zErrMsg - it would not substitute |
| 1461 | 1461 | * this %s(zUsername), or at least I don't know how to force it to.*/ |
| 1462 | 1462 | @ <p><span class="loginError"> |
| 1463 | - @ %s(zUsername) already exists. | |
| 1463 | + @ %h(zUsername) already exists. | |
| 1464 | 1464 | @ </span></p> |
| 1465 | 1465 | }else{ |
| 1466 | 1466 | char *zPw = sha1_shared_secret(blob_str(&passwd), blob_str(&login), 0); |
| 1467 | 1467 | int uid; |
| 1468 | 1468 | db_multi_exec( |
| 1469 | 1469 |
| --- src/login.c | |
| +++ src/login.c | |
| @@ -1458,11 +1458,11 @@ | |
| 1458 | |
| 1459 | if( db_exists("SELECT 1 FROM user WHERE login=%B", &login) ){ |
| 1460 | /* Here lies the reason I don't use zErrMsg - it would not substitute |
| 1461 | * this %s(zUsername), or at least I don't know how to force it to.*/ |
| 1462 | @ <p><span class="loginError"> |
| 1463 | @ %s(zUsername) already exists. |
| 1464 | @ </span></p> |
| 1465 | }else{ |
| 1466 | char *zPw = sha1_shared_secret(blob_str(&passwd), blob_str(&login), 0); |
| 1467 | int uid; |
| 1468 | db_multi_exec( |
| 1469 |
| --- src/login.c | |
| +++ src/login.c | |
| @@ -1458,11 +1458,11 @@ | |
| 1458 | |
| 1459 | if( db_exists("SELECT 1 FROM user WHERE login=%B", &login) ){ |
| 1460 | /* Here lies the reason I don't use zErrMsg - it would not substitute |
| 1461 | * this %s(zUsername), or at least I don't know how to force it to.*/ |
| 1462 | @ <p><span class="loginError"> |
| 1463 | @ %h(zUsername) already exists. |
| 1464 | @ </span></p> |
| 1465 | }else{ |
| 1466 | char *zPw = sha1_shared_secret(blob_str(&passwd), blob_str(&login), 0); |
| 1467 | int uid; |
| 1468 | db_multi_exec( |
| 1469 |
+1
-1
| --- src/name.c | ||
| +++ src/name.c | ||
| @@ -467,11 +467,11 @@ | ||
| 467 | 467 | @ <li><p><a href="%R/%T(zSrc)/%!S(zUuid)"> |
| 468 | 468 | @ %s(zUuid)</a> - |
| 469 | 469 | @ <ul></ul> |
| 470 | 470 | @ Ticket |
| 471 | 471 | hyperlink_to_uuid(zUuid); |
| 472 | - @ - %s(zTitle). | |
| 472 | + @ - %h(zTitle). | |
| 473 | 473 | @ <ul><li> |
| 474 | 474 | object_description(rid, 0, 0); |
| 475 | 475 | @ </li></ul> |
| 476 | 476 | @ </p></li> |
| 477 | 477 | } |
| 478 | 478 |
| --- src/name.c | |
| +++ src/name.c | |
| @@ -467,11 +467,11 @@ | |
| 467 | @ <li><p><a href="%R/%T(zSrc)/%!S(zUuid)"> |
| 468 | @ %s(zUuid)</a> - |
| 469 | @ <ul></ul> |
| 470 | @ Ticket |
| 471 | hyperlink_to_uuid(zUuid); |
| 472 | @ - %s(zTitle). |
| 473 | @ <ul><li> |
| 474 | object_description(rid, 0, 0); |
| 475 | @ </li></ul> |
| 476 | @ </p></li> |
| 477 | } |
| 478 |
| --- src/name.c | |
| +++ src/name.c | |
| @@ -467,11 +467,11 @@ | |
| 467 | @ <li><p><a href="%R/%T(zSrc)/%!S(zUuid)"> |
| 468 | @ %s(zUuid)</a> - |
| 469 | @ <ul></ul> |
| 470 | @ Ticket |
| 471 | hyperlink_to_uuid(zUuid); |
| 472 | @ - %h(zTitle). |
| 473 | @ <ul><li> |
| 474 | object_description(rid, 0, 0); |
| 475 | @ </li></ul> |
| 476 | @ </p></li> |
| 477 | } |
| 478 |
+1
-1
| --- src/setup.c | ||
| +++ src/setup.c | ||
| @@ -485,11 +485,11 @@ | ||
| 485 | 485 | "with capabilities [%q].", |
| 486 | 486 | zLogin, zCap ); |
| 487 | 487 | if( zErr ){ |
| 488 | 488 | style_header("User Change Error"); |
| 489 | 489 | admin_log( "Error updating user '%q': %s'.", zLogin, zErr ); |
| 490 | - @ <span class="loginError">%s(zErr)</span> | |
| 490 | + @ <span class="loginError">%h(zErr)</span> | |
| 491 | 491 | @ |
| 492 | 492 | @ <p><a href="setup_uedit?id=%d(uid)">[Bummer]</a></p> |
| 493 | 493 | style_footer(); |
| 494 | 494 | return; |
| 495 | 495 | } |
| 496 | 496 |
| --- src/setup.c | |
| +++ src/setup.c | |
| @@ -485,11 +485,11 @@ | |
| 485 | "with capabilities [%q].", |
| 486 | zLogin, zCap ); |
| 487 | if( zErr ){ |
| 488 | style_header("User Change Error"); |
| 489 | admin_log( "Error updating user '%q': %s'.", zLogin, zErr ); |
| 490 | @ <span class="loginError">%s(zErr)</span> |
| 491 | @ |
| 492 | @ <p><a href="setup_uedit?id=%d(uid)">[Bummer]</a></p> |
| 493 | style_footer(); |
| 494 | return; |
| 495 | } |
| 496 |
| --- src/setup.c | |
| +++ src/setup.c | |
| @@ -485,11 +485,11 @@ | |
| 485 | "with capabilities [%q].", |
| 486 | zLogin, zCap ); |
| 487 | if( zErr ){ |
| 488 | style_header("User Change Error"); |
| 489 | admin_log( "Error updating user '%q': %s'.", zLogin, zErr ); |
| 490 | @ <span class="loginError">%h(zErr)</span> |
| 491 | @ |
| 492 | @ <p><a href="setup_uedit?id=%d(uid)">[Bummer]</a></p> |
| 493 | style_footer(); |
| 494 | return; |
| 495 | } |
| 496 |