Fossil SCM

Fix harmless compiler warnings. Also remove the "ago" text from the "Last Change" column in the subscriber list webpage.

drh 2018-06-25 16:19 trunk
Commit 69d332ff96668aa5bac1286af7fcdb9d43d4437763ad7022dfa67c76fb93ce8d
Parent 7e87699dcf78eb2…
3 files changed +1 -1 +3 -4 -1
~ src/cgi.c ~ src/email.c ~ src/security_audit.c
M src/cgi.c
+1 -1
--- src/cgi.c
+++ src/cgi.c
@@ -338,11 +338,11 @@
338338
 }
339339
 fflush(g.httpOut);
340340
 CGIDEBUG(("DONE\n"));
341341
342342
 /* After the webpage has been sent, do any useful background
343
- /* processing.
343
+ ** processing.
344344
 */
345345
 if( iReplyStatus==200 ){
346346
 email_auto_exec();
347347
 }
348348
 }
349349
--- src/cgi.c
+++ src/cgi.c
@@ -338,11 +338,11 @@
338 }
339 fflush(g.httpOut);
340 CGIDEBUG(("DONE\n"));
341
342 /* After the webpage has been sent, do any useful background
343 /* processing.
344 */
345 if( iReplyStatus==200 ){
346 email_auto_exec();
347 }
348 }
349
--- src/cgi.c
+++ src/cgi.c
@@ -338,11 +338,11 @@
338 }
339 fflush(g.httpOut);
340 CGIDEBUG(("DONE\n"));
341
342 /* After the webpage has been sent, do any useful background
343 ** processing.
344 */
345 if( iReplyStatus==200 ){
346 email_auto_exec();
347 }
348 }
349
M src/email.c
+3 -4
--- src/email.c
+++ src/email.c
@@ -414,11 +414,10 @@
414414
 **
415415
 ** The EmailSender object returned must be freed using email_sender_free().
416416
 */
417417
 EmailSender *email_sender_new(const char *zAltDest, int bImmediateFail){
418418
 EmailSender *p;
419
- char *zMissing = 0;
420419
421420
 p = fossil_malloc(sizeof(*p));
422421
 memset(p, 0, sizeof(*p));
423422
 p->bImmediateFail = bImmediateFail;
424423
 if( zAltDest ){
@@ -1096,12 +1095,12 @@
10961095
 int sdigest, sdonotcall, sverified;
10971096
 const char *ssub;
10981097
 const char *semail;
10991098
 const char *smip;
11001099
 const char *suname;
1101
- char *smtime;
1102
- char *sctime;
1100
+ const char *smtime;
1101
+ const char *sctime;
11031102
 int eErr = 0;
11041103
 char *zErr = 0;
11051104
11061105
 if( email_webpages_disabled() ) return;
11071106
 login_check_credentials();
@@ -1485,11 +1484,11 @@
14851484
 @ %h(db_column_text(&q,1))</a></td>
14861485
 @ <td>%h(db_column_text(&q,2))</td>
14871486
 @ <td>%s(db_column_int(&q,5)?"digest":"")</td>
14881487
 @ <td>%h(db_column_text(&q,3))</td>
14891488
 @ <td>%s(db_column_int(&q,4)?"yes":"pending")</td>
1490
- @ <td>%z(human_readable_age(rAge)) ago</td>
1489
+ @ <td>%z(human_readable_age(rAge))</td>
14911490
 @ <td>%h(db_column_text(&q,6))</td>
14921491
 @ </tr>
14931492
 }
14941493
 @ </table>
14951494
 db_finalize(&q);
14961495
--- src/email.c
+++ src/email.c
@@ -414,11 +414,10 @@
414 **
415 ** The EmailSender object returned must be freed using email_sender_free().
416 */
417 EmailSender *email_sender_new(const char *zAltDest, int bImmediateFail){
418 EmailSender *p;
419 char *zMissing = 0;
420
421 p = fossil_malloc(sizeof(*p));
422 memset(p, 0, sizeof(*p));
423 p->bImmediateFail = bImmediateFail;
424 if( zAltDest ){
@@ -1096,12 +1095,12 @@
1096 int sdigest, sdonotcall, sverified;
1097 const char *ssub;
1098 const char *semail;
1099 const char *smip;
1100 const char *suname;
1101 char *smtime;
1102 char *sctime;
1103 int eErr = 0;
1104 char *zErr = 0;
1105
1106 if( email_webpages_disabled() ) return;
1107 login_check_credentials();
@@ -1485,11 +1484,11 @@
1485 @ %h(db_column_text(&q,1))</a></td>
1486 @ <td>%h(db_column_text(&q,2))</td>
1487 @ <td>%s(db_column_int(&q,5)?"digest":"")</td>
1488 @ <td>%h(db_column_text(&q,3))</td>
1489 @ <td>%s(db_column_int(&q,4)?"yes":"pending")</td>
1490 @ <td>%z(human_readable_age(rAge)) ago</td>
1491 @ <td>%h(db_column_text(&q,6))</td>
1492 @ </tr>
1493 }
1494 @ </table>
1495 db_finalize(&q);
1496
--- src/email.c
+++ src/email.c
@@ -414,11 +414,10 @@
414 **
415 ** The EmailSender object returned must be freed using email_sender_free().
416 */
417 EmailSender *email_sender_new(const char *zAltDest, int bImmediateFail){
418 EmailSender *p;
 
419
420 p = fossil_malloc(sizeof(*p));
421 memset(p, 0, sizeof(*p));
422 p->bImmediateFail = bImmediateFail;
423 if( zAltDest ){
@@ -1096,12 +1095,12 @@
1095 int sdigest, sdonotcall, sverified;
1096 const char *ssub;
1097 const char *semail;
1098 const char *smip;
1099 const char *suname;
1100 const char *smtime;
1101 const char *sctime;
1102 int eErr = 0;
1103 char *zErr = 0;
1104
1105 if( email_webpages_disabled() ) return;
1106 login_check_credentials();
@@ -1485,11 +1484,11 @@
1484 @ %h(db_column_text(&q,1))</a></td>
1485 @ <td>%h(db_column_text(&q,2))</td>
1486 @ <td>%s(db_column_int(&q,5)?"digest":"")</td>
1487 @ <td>%h(db_column_text(&q,3))</td>
1488 @ <td>%s(db_column_int(&q,4)?"yes":"pending")</td>
1489 @ <td>%z(human_readable_age(rAge))</td>
1490 @ <td>%h(db_column_text(&q,6))</td>
1491 @ </tr>
1492 }
1493 @ </table>
1494 db_finalize(&q);
1495
M src/security_audit.c
-1
--- src/security_audit.c
+++ src/security_audit.c
@@ -410,11 +410,10 @@
410410
 */
411411
 void errorlog_page(void){
412412
 login_check_credentials();
413413
 i64 szFile;
414414
 FILE *in;
415
- long got;
416415
 char z[10000];
417416
 if( !g.perm.Setup && !g.perm.Admin ){
418417
 login_needed(0);
419418
 return;
420419
 }
421420
--- src/security_audit.c
+++ src/security_audit.c
@@ -410,11 +410,10 @@
410 */
411 void errorlog_page(void){
412 login_check_credentials();
413 i64 szFile;
414 FILE *in;
415 long got;
416 char z[10000];
417 if( !g.perm.Setup && !g.perm.Admin ){
418 login_needed(0);
419 return;
420 }
421
--- src/security_audit.c
+++ src/security_audit.c
@@ -410,11 +410,10 @@
410 */
411 void errorlog_page(void){
412 login_check_credentials();
413 i64 szFile;
414 FILE *in;
 
415 char z[10000];
416 if( !g.perm.Setup && !g.perm.Admin ){
417 login_needed(0);
418 return;
419 }
420

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button