Fossil SCM

eliminate many unnessary type-casts

jan.nijtmans 2015-09-16 10:49 trunk
Commit 5b456cfa6b8ad2a05cc27015446b47c0a3b257cf
Parent a6fd491d3a44d30…
7 files changed +3 -3 +1 -1 +3 -3 +4 -4 +2 -2 +9 -9 +1 -1
~ src/db.c ~ src/diffcmd.c ~ src/http_transport.c ~ src/setup.c ~ src/skins.c ~ src/tktsetup.c ~ src/xfersetup.c
M src/db.c
+3 -3
--- src/db.c
+++ src/db.c
@@ -2018,17 +2018,17 @@
20182018
 z = fossil_strdup(zDefault);
20192019
 }
20202020
 }
20212021
 return z;
20222022
 }
2023
-const char *db_get_mtime(const char *zName, const char *zFormat, const char *zDefault){
2024
- const char *z = 0;
2023
+char *db_get_mtime(const char *zName, const char *zFormat, const char *zDefault){
2024
+ char *z = 0;
20252025
 if( g.repositoryOpen ){
20262026
 z = db_text(0, "SELECT mtime FROM config WHERE name=%Q", zName);
20272027
 }
20282028
 if( z==0 ){
2029
- z = zDefault;
2029
+ z = fossil_strdup(zDefault);
20302030
 }else if( zFormat!=0 ){
20312031
 z = db_text(0, "SELECT strftime(%Q,%Q,'unixepoch');", zFormat, z);
20322032
 }
20332033
 return z;
20342034
 }
20352035
--- src/db.c
+++ src/db.c
@@ -2018,17 +2018,17 @@
2018 z = fossil_strdup(zDefault);
2019 }
2020 }
2021 return z;
2022 }
2023 const char *db_get_mtime(const char *zName, const char *zFormat, const char *zDefault){
2024 const char *z = 0;
2025 if( g.repositoryOpen ){
2026 z = db_text(0, "SELECT mtime FROM config WHERE name=%Q", zName);
2027 }
2028 if( z==0 ){
2029 z = zDefault;
2030 }else if( zFormat!=0 ){
2031 z = db_text(0, "SELECT strftime(%Q,%Q,'unixepoch');", zFormat, z);
2032 }
2033 return z;
2034 }
2035
--- src/db.c
+++ src/db.c
@@ -2018,17 +2018,17 @@
2018 z = fossil_strdup(zDefault);
2019 }
2020 }
2021 return z;
2022 }
2023 char *db_get_mtime(const char *zName, const char *zFormat, const char *zDefault){
2024 char *z = 0;
2025 if( g.repositoryOpen ){
2026 z = db_text(0, "SELECT mtime FROM config WHERE name=%Q", zName);
2027 }
2028 if( z==0 ){
2029 z = fossil_strdup(zDefault);
2030 }else if( zFormat!=0 ){
2031 z = db_text(0, "SELECT strftime(%Q,%Q,'unixepoch');", zFormat, z);
2032 }
2033 return z;
2034 }
2035
M src/diffcmd.c
+1 -1
--- src/diffcmd.c
+++ src/diffcmd.c
@@ -665,11 +665,11 @@
665665
 /*
666666
 ** Return the name of the external diff command, or return NULL if
667667
 ** no external diff command is defined.
668668
 */
669669
 const char *diff_command_external(int guiDiff){
670
- char *zDefault;
670
+ const char *zDefault;
671671
 const char *zName;
672672
673673
 if( guiDiff ){
674674
 #if defined(_WIN32)
675675
 zDefault = "WinDiff.exe";
676676
--- src/diffcmd.c
+++ src/diffcmd.c
@@ -665,11 +665,11 @@
665 /*
666 ** Return the name of the external diff command, or return NULL if
667 ** no external diff command is defined.
668 */
669 const char *diff_command_external(int guiDiff){
670 char *zDefault;
671 const char *zName;
672
673 if( guiDiff ){
674 #if defined(_WIN32)
675 zDefault = "WinDiff.exe";
676
--- src/diffcmd.c
+++ src/diffcmd.c
@@ -665,11 +665,11 @@
665 /*
666 ** Return the name of the external diff command, or return NULL if
667 ** no external diff command is defined.
668 */
669 const char *diff_command_external(int guiDiff){
670 const char *zDefault;
671 const char *zName;
672
673 if( guiDiff ){
674 #if defined(_WIN32)
675 zDefault = "WinDiff.exe";
676
M src/http_transport.c
+3 -3
--- src/http_transport.c
+++ src/http_transport.c
@@ -78,23 +78,23 @@
7878
7979
 /*
8080
 ** Default SSH command
8181
 */
8282
 #ifdef _WIN32
83
-static char zDefaultSshCmd[] = "plink -ssh -T";
83
+static const char zDefaultSshCmd[] = "plink -ssh -T";
8484
 #else
85
-static char zDefaultSshCmd[] = "ssh -e none -T";
85
+static const char zDefaultSshCmd[] = "ssh -e none -T";
8686
 #endif
8787
8888
 /*
8989
 ** SSH initialization of the transport layer
9090
 */
9191
 int transport_ssh_open(UrlData *pUrlData){
9292
 /* For SSH we need to create and run SSH fossil http
9393
 ** to talk to the remote machine.
9494
 */
95
- const char *zSsh; /* The base SSH command */
95
+ char *zSsh; /* The base SSH command */
9696
 Blob zCmd; /* The SSH command */
9797
 char *zHost; /* The host name to contact */
9898
 int n; /* Size of prefix string */
9999
100100
 socket_ssh_resolve_addr(pUrlData);
101101
--- src/http_transport.c
+++ src/http_transport.c
@@ -78,23 +78,23 @@
78
79 /*
80 ** Default SSH command
81 */
82 #ifdef _WIN32
83 static char zDefaultSshCmd[] = "plink -ssh -T";
84 #else
85 static char zDefaultSshCmd[] = "ssh -e none -T";
86 #endif
87
88 /*
89 ** SSH initialization of the transport layer
90 */
91 int transport_ssh_open(UrlData *pUrlData){
92 /* For SSH we need to create and run SSH fossil http
93 ** to talk to the remote machine.
94 */
95 const char *zSsh; /* The base SSH command */
96 Blob zCmd; /* The SSH command */
97 char *zHost; /* The host name to contact */
98 int n; /* Size of prefix string */
99
100 socket_ssh_resolve_addr(pUrlData);
101
--- src/http_transport.c
+++ src/http_transport.c
@@ -78,23 +78,23 @@
78
79 /*
80 ** Default SSH command
81 */
82 #ifdef _WIN32
83 static const char zDefaultSshCmd[] = "plink -ssh -T";
84 #else
85 static const char zDefaultSshCmd[] = "ssh -e none -T";
86 #endif
87
88 /*
89 ** SSH initialization of the transport layer
90 */
91 int transport_ssh_open(UrlData *pUrlData){
92 /* For SSH we need to create and run SSH fossil http
93 ** to talk to the remote machine.
94 */
95 char *zSsh; /* The base SSH command */
96 Blob zCmd; /* The SSH command */
97 char *zHost; /* The host name to contact */
98 int n; /* Size of prefix string */
99
100 socket_ssh_resolve_addr(pUrlData);
101
M src/setup.c
+4 -4
--- src/setup.c
+++ src/setup.c
@@ -328,11 +328,11 @@
328328
 const char *zOldLogin;
329329
 int doWrite;
330330
 int uid, i;
331331
 int higherUser = 0; /* True if user being edited is SETUP and the */
332332
 /* user doing the editing is ADMIN. Disallow editing */
333
- char *inherit[128];
333
+ const char *inherit[128];
334334
 int a[128];
335335
 const char *oa[128];
336336
337337
 /* Must have ADMIN privileges to access this page
338338
 */
@@ -906,11 +906,11 @@
906906
 void entry_attribute(
907907
 const char *zLabel, /* The text label on the entry box */
908908
 int width, /* Width of the entry box */
909909
 const char *zVar, /* The corresponding row in the VAR table */
910910
 const char *zQParm, /* The query parameter */
911
- char *zDflt, /* Default value if VAR table entry does not exist */
911
+ const char *zDflt, /* Default value if VAR table entry does not exist */
912912
 int disabled /* 1 if disabled */
913913
 ){
914914
 const char *zVal = db_get(zVar, zDflt);
915915
 const char *zQ = P(zQParm);
916916
 if( zQ && fossil_strcmp(zQ,zVal)!=0 ){
@@ -938,11 +938,11 @@
938938
 const char *zVar, /* The corresponding row in the VAR table */
939939
 const char *zQP, /* The query parameter */
940940
 const char *zDflt, /* Default value if VAR table entry does not exist */
941941
 int disabled /* 1 if the textarea should not be editable */
942942
 ){
943
- const char *z = db_get(zVar, (char*)zDflt);
943
+ const char *z = db_get(zVar, zDflt);
944944
 const char *zQ = P(zQP);
945945
 if( zQ && !disabled && fossil_strcmp(zQ,z)!=0){
946946
 const int nZQ = (int)strlen(zQ);
947947
 login_verify_csrf_secret();
948948
 db_set(zVar, zQ, 0);
@@ -972,11 +972,11 @@
972972
 const char *zQP, /* The query parameter */
973973
 const char *zDflt, /* Default value if VAR table entry does not exist */
974974
 int nChoice, /* Number of choices */
975975
 const char *const *azChoice /* Choices. 2 per choice: (VAR value, Display) */
976976
 ){
977
- const char *z = db_get(zVar, (char*)zDflt);
977
+ const char *z = db_get(zVar, zDflt);
978978
 const char *zQ = P(zQP);
979979
 int i;
980980
 if( zQ && fossil_strcmp(zQ,z)!=0){
981981
 const int nZQ = (int)strlen(zQ);
982982
 login_verify_csrf_secret();
983983
--- src/setup.c
+++ src/setup.c
@@ -328,11 +328,11 @@
328 const char *zOldLogin;
329 int doWrite;
330 int uid, i;
331 int higherUser = 0; /* True if user being edited is SETUP and the */
332 /* user doing the editing is ADMIN. Disallow editing */
333 char *inherit[128];
334 int a[128];
335 const char *oa[128];
336
337 /* Must have ADMIN privileges to access this page
338 */
@@ -906,11 +906,11 @@
906 void entry_attribute(
907 const char *zLabel, /* The text label on the entry box */
908 int width, /* Width of the entry box */
909 const char *zVar, /* The corresponding row in the VAR table */
910 const char *zQParm, /* The query parameter */
911 char *zDflt, /* Default value if VAR table entry does not exist */
912 int disabled /* 1 if disabled */
913 ){
914 const char *zVal = db_get(zVar, zDflt);
915 const char *zQ = P(zQParm);
916 if( zQ && fossil_strcmp(zQ,zVal)!=0 ){
@@ -938,11 +938,11 @@
938 const char *zVar, /* The corresponding row in the VAR table */
939 const char *zQP, /* The query parameter */
940 const char *zDflt, /* Default value if VAR table entry does not exist */
941 int disabled /* 1 if the textarea should not be editable */
942 ){
943 const char *z = db_get(zVar, (char*)zDflt);
944 const char *zQ = P(zQP);
945 if( zQ && !disabled && fossil_strcmp(zQ,z)!=0){
946 const int nZQ = (int)strlen(zQ);
947 login_verify_csrf_secret();
948 db_set(zVar, zQ, 0);
@@ -972,11 +972,11 @@
972 const char *zQP, /* The query parameter */
973 const char *zDflt, /* Default value if VAR table entry does not exist */
974 int nChoice, /* Number of choices */
975 const char *const *azChoice /* Choices. 2 per choice: (VAR value, Display) */
976 ){
977 const char *z = db_get(zVar, (char*)zDflt);
978 const char *zQ = P(zQP);
979 int i;
980 if( zQ && fossil_strcmp(zQ,z)!=0){
981 const int nZQ = (int)strlen(zQ);
982 login_verify_csrf_secret();
983
--- src/setup.c
+++ src/setup.c
@@ -328,11 +328,11 @@
328 const char *zOldLogin;
329 int doWrite;
330 int uid, i;
331 int higherUser = 0; /* True if user being edited is SETUP and the */
332 /* user doing the editing is ADMIN. Disallow editing */
333 const char *inherit[128];
334 int a[128];
335 const char *oa[128];
336
337 /* Must have ADMIN privileges to access this page
338 */
@@ -906,11 +906,11 @@
906 void entry_attribute(
907 const char *zLabel, /* The text label on the entry box */
908 int width, /* Width of the entry box */
909 const char *zVar, /* The corresponding row in the VAR table */
910 const char *zQParm, /* The query parameter */
911 const char *zDflt, /* Default value if VAR table entry does not exist */
912 int disabled /* 1 if disabled */
913 ){
914 const char *zVal = db_get(zVar, zDflt);
915 const char *zQ = P(zQParm);
916 if( zQ && fossil_strcmp(zQ,zVal)!=0 ){
@@ -938,11 +938,11 @@
938 const char *zVar, /* The corresponding row in the VAR table */
939 const char *zQP, /* The query parameter */
940 const char *zDflt, /* Default value if VAR table entry does not exist */
941 int disabled /* 1 if the textarea should not be editable */
942 ){
943 const char *z = db_get(zVar, zDflt);
944 const char *zQ = P(zQP);
945 if( zQ && !disabled && fossil_strcmp(zQ,z)!=0){
946 const int nZQ = (int)strlen(zQ);
947 login_verify_csrf_secret();
948 db_set(zVar, zQ, 0);
@@ -972,11 +972,11 @@
972 const char *zQP, /* The query parameter */
973 const char *zDflt, /* Default value if VAR table entry does not exist */
974 int nChoice, /* Number of choices */
975 const char *const *azChoice /* Choices. 2 per choice: (VAR value, Display) */
976 ){
977 const char *z = db_get(zVar, zDflt);
978 const char *zQ = P(zQP);
979 int i;
980 if( zQ && fossil_strcmp(zQ,z)!=0){
981 const int nZQ = (int)strlen(zQ);
982 login_verify_csrf_secret();
983
M src/skins.c
+2 -2
--- src/skins.c
+++ src/skins.c
@@ -73,11 +73,11 @@
7373
 **
7474
 ** The following array holds the value for all known skin details.
7575
 */
7676
 static struct SkinDetail {
7777
 const char *zName; /* Name of the detail */
78
- char *zValue; /* Value of the detail */
78
+ const char *zValue; /* Value of the detail */
7979
 } aSkinDetail[] = {
8080
 { "timeline-arrowheads", "1" },
8181
 { "timeline-circle-nodes", "0" },
8282
 { "timeline-color-graph-lines", "0" },
8383
 { "white-foreground", "0" },
@@ -250,11 +250,11 @@
250250
 if( zAltSkinDir ){
251251
 h = skin_hash(0, zAltSkinDir);
252252
 }else if( pAltSkin ){
253253
 h = skin_hash(0, pAltSkin->zLabel);
254254
 }else{
255
- const char *zMTime = db_get_mtime(zResource, 0, 0);
255
+ char *zMTime = db_get_mtime(zResource, 0, 0);
256256
 h = skin_hash(0, zMTime);
257257
 fossil_free(zMTime);
258258
 }
259259
 h = skin_hash(h, MANIFEST_UUID);
260260
 return h;
261261
--- src/skins.c
+++ src/skins.c
@@ -73,11 +73,11 @@
73 **
74 ** The following array holds the value for all known skin details.
75 */
76 static struct SkinDetail {
77 const char *zName; /* Name of the detail */
78 char *zValue; /* Value of the detail */
79 } aSkinDetail[] = {
80 { "timeline-arrowheads", "1" },
81 { "timeline-circle-nodes", "0" },
82 { "timeline-color-graph-lines", "0" },
83 { "white-foreground", "0" },
@@ -250,11 +250,11 @@
250 if( zAltSkinDir ){
251 h = skin_hash(0, zAltSkinDir);
252 }else if( pAltSkin ){
253 h = skin_hash(0, pAltSkin->zLabel);
254 }else{
255 const char *zMTime = db_get_mtime(zResource, 0, 0);
256 h = skin_hash(0, zMTime);
257 fossil_free(zMTime);
258 }
259 h = skin_hash(h, MANIFEST_UUID);
260 return h;
261
--- src/skins.c
+++ src/skins.c
@@ -73,11 +73,11 @@
73 **
74 ** The following array holds the value for all known skin details.
75 */
76 static struct SkinDetail {
77 const char *zName; /* Name of the detail */
78 const char *zValue; /* Value of the detail */
79 } aSkinDetail[] = {
80 { "timeline-arrowheads", "1" },
81 { "timeline-circle-nodes", "0" },
82 { "timeline-color-graph-lines", "0" },
83 { "white-foreground", "0" },
@@ -250,11 +250,11 @@
250 if( zAltSkinDir ){
251 h = skin_hash(0, zAltSkinDir);
252 }else if( pAltSkin ){
253 h = skin_hash(0, pAltSkin->zLabel);
254 }else{
255 char *zMTime = db_get_mtime(zResource, 0, 0);
256 h = skin_hash(0, zMTime);
257 fossil_free(zMTime);
258 }
259 h = skin_hash(h, MANIFEST_UUID);
260 return h;
261
M src/tktsetup.c
+9 -9
--- src/tktsetup.c
+++ src/tktsetup.c
@@ -99,11 +99,11 @@
9999
100100
 /*
101101
 ** Return the ticket table definition
102102
 */
103103
 const char *ticket_table_schema(void){
104
- return db_get("ticket-table", (char*)zDefaultTicketTable);
104
+ return db_get("ticket-table", zDefaultTicketTable);
105105
 }
106106
107107
 /*
108108
 ** Common implementation for the ticket setup editor pages.
109109
 */
@@ -128,11 +128,11 @@
128128
 cgi_redirect("tktsetup");
129129
 }
130130
 isSubmit = P("submit")!=0;
131131
 z = P("x");
132132
 if( z==0 ){
133
- z = db_get(zDbField, (char*)zDfltValue);
133
+ z = db_get(zDbField, zDfltValue);
134134
 }
135135
 style_header("Edit %s", zTitle);
136136
 if( P("clear")!=0 ){
137137
 login_verify_csrf_secret();
138138
 db_unset(zDbField, 0);
@@ -240,11 +240,11 @@
240240
241241
 /*
242242
 ** Return the ticket common code.
243243
 */
244244
 const char *ticket_common_code(void){
245
- return db_get("ticket-common", (char*)zDefaultTicketCommon);
245
+ return db_get("ticket-common", zDefaultTicketCommon);
246246
 }
247247
248248
 /*
249249
 ** WEBPAGE: tktsetup_com
250250
 ** Administrative page used to define TH1 script that is
@@ -272,11 +272,11 @@
272272
273273
 /*
274274
 ** Return the ticket change code.
275275
 */
276276
 const char *ticket_change_code(void){
277
- return db_get("ticket-change", (char*)zDefaultTicketChange);
277
+ return db_get("ticket-change", zDefaultTicketChange);
278278
 }
279279
280280
 /*
281281
 ** WEBPAGE: tktsetup_change
282282
 ** Adminstrative screen used to view or edit the TH1 script
@@ -417,11 +417,11 @@
417417
418418
 /*
419419
 ** Return the code used to generate the new ticket page
420420
 */
421421
 const char *ticket_newpage_code(void){
422
- return db_get("ticket-newpage", (char*)zDefaultNew);
422
+ return db_get("ticket-newpage", zDefaultNew);
423423
 }
424424
425425
 /*
426426
 ** WEBPAGE: tktsetup_newpage
427427
 ** Administrative page used to view or edit the TH1 script used
@@ -558,11 +558,11 @@
558558
559559
 /*
560560
 ** Return the code used to generate the view ticket page
561561
 */
562562
 const char *ticket_viewpage_code(void){
563
- return db_get("ticket-viewpage", (char*)zDefaultView);
563
+ return db_get("ticket-viewpage", zDefaultView);
564564
 }
565565
566566
 /*
567567
 ** WEBPAGE: tktsetup_viewpage
568568
 ** Administrative page used to view or edit the TH1 script that
@@ -699,11 +699,11 @@
699699
700700
 /*
701701
 ** Return the code used to generate the edit ticket page
702702
 */
703703
 const char *ticket_editpage_code(void){
704
- return db_get("ticket-editpage", (char*)zDefaultEdit);
704
+ return db_get("ticket-editpage", zDefaultEdit);
705705
 }
706706
707707
 /*
708708
 ** WEBPAGE: tktsetup_editpage
709709
 ** Administrative page for viewing or editing the TH1 script that
@@ -755,11 +755,11 @@
755755
756756
 /*
757757
 ** Return the code used to generate the report list
758758
 */
759759
 const char *ticket_reportlist_code(void){
760
- return db_get("ticket-reportlist", (char*)zDefaultReportList);
760
+ return db_get("ticket-reportlist", zDefaultReportList);
761761
 }
762762
763763
 /*
764764
 ** WEBPAGE: tktsetup_reportlist
765765
 ** Administrative page used to view or edit the TH1 script that
@@ -848,11 +848,11 @@
848848
849849
 /*
850850
 ** Return the template ticket report format:
851851
 */
852852
 const char *ticket_key_template(void){
853
- return db_get("ticket-key-template", (char*)zDefaultKey);
853
+ return db_get("ticket-key-template", zDefaultKey);
854854
 }
855855
856856
 /*
857857
 ** WEBPAGE: tktsetup_keytplt
858858
 **
859859
--- src/tktsetup.c
+++ src/tktsetup.c
@@ -99,11 +99,11 @@
99
100 /*
101 ** Return the ticket table definition
102 */
103 const char *ticket_table_schema(void){
104 return db_get("ticket-table", (char*)zDefaultTicketTable);
105 }
106
107 /*
108 ** Common implementation for the ticket setup editor pages.
109 */
@@ -128,11 +128,11 @@
128 cgi_redirect("tktsetup");
129 }
130 isSubmit = P("submit")!=0;
131 z = P("x");
132 if( z==0 ){
133 z = db_get(zDbField, (char*)zDfltValue);
134 }
135 style_header("Edit %s", zTitle);
136 if( P("clear")!=0 ){
137 login_verify_csrf_secret();
138 db_unset(zDbField, 0);
@@ -240,11 +240,11 @@
240
241 /*
242 ** Return the ticket common code.
243 */
244 const char *ticket_common_code(void){
245 return db_get("ticket-common", (char*)zDefaultTicketCommon);
246 }
247
248 /*
249 ** WEBPAGE: tktsetup_com
250 ** Administrative page used to define TH1 script that is
@@ -272,11 +272,11 @@
272
273 /*
274 ** Return the ticket change code.
275 */
276 const char *ticket_change_code(void){
277 return db_get("ticket-change", (char*)zDefaultTicketChange);
278 }
279
280 /*
281 ** WEBPAGE: tktsetup_change
282 ** Adminstrative screen used to view or edit the TH1 script
@@ -417,11 +417,11 @@
417
418 /*
419 ** Return the code used to generate the new ticket page
420 */
421 const char *ticket_newpage_code(void){
422 return db_get("ticket-newpage", (char*)zDefaultNew);
423 }
424
425 /*
426 ** WEBPAGE: tktsetup_newpage
427 ** Administrative page used to view or edit the TH1 script used
@@ -558,11 +558,11 @@
558
559 /*
560 ** Return the code used to generate the view ticket page
561 */
562 const char *ticket_viewpage_code(void){
563 return db_get("ticket-viewpage", (char*)zDefaultView);
564 }
565
566 /*
567 ** WEBPAGE: tktsetup_viewpage
568 ** Administrative page used to view or edit the TH1 script that
@@ -699,11 +699,11 @@
699
700 /*
701 ** Return the code used to generate the edit ticket page
702 */
703 const char *ticket_editpage_code(void){
704 return db_get("ticket-editpage", (char*)zDefaultEdit);
705 }
706
707 /*
708 ** WEBPAGE: tktsetup_editpage
709 ** Administrative page for viewing or editing the TH1 script that
@@ -755,11 +755,11 @@
755
756 /*
757 ** Return the code used to generate the report list
758 */
759 const char *ticket_reportlist_code(void){
760 return db_get("ticket-reportlist", (char*)zDefaultReportList);
761 }
762
763 /*
764 ** WEBPAGE: tktsetup_reportlist
765 ** Administrative page used to view or edit the TH1 script that
@@ -848,11 +848,11 @@
848
849 /*
850 ** Return the template ticket report format:
851 */
852 const char *ticket_key_template(void){
853 return db_get("ticket-key-template", (char*)zDefaultKey);
854 }
855
856 /*
857 ** WEBPAGE: tktsetup_keytplt
858 **
859
--- src/tktsetup.c
+++ src/tktsetup.c
@@ -99,11 +99,11 @@
99
100 /*
101 ** Return the ticket table definition
102 */
103 const char *ticket_table_schema(void){
104 return db_get("ticket-table", zDefaultTicketTable);
105 }
106
107 /*
108 ** Common implementation for the ticket setup editor pages.
109 */
@@ -128,11 +128,11 @@
128 cgi_redirect("tktsetup");
129 }
130 isSubmit = P("submit")!=0;
131 z = P("x");
132 if( z==0 ){
133 z = db_get(zDbField, zDfltValue);
134 }
135 style_header("Edit %s", zTitle);
136 if( P("clear")!=0 ){
137 login_verify_csrf_secret();
138 db_unset(zDbField, 0);
@@ -240,11 +240,11 @@
240
241 /*
242 ** Return the ticket common code.
243 */
244 const char *ticket_common_code(void){
245 return db_get("ticket-common", zDefaultTicketCommon);
246 }
247
248 /*
249 ** WEBPAGE: tktsetup_com
250 ** Administrative page used to define TH1 script that is
@@ -272,11 +272,11 @@
272
273 /*
274 ** Return the ticket change code.
275 */
276 const char *ticket_change_code(void){
277 return db_get("ticket-change", zDefaultTicketChange);
278 }
279
280 /*
281 ** WEBPAGE: tktsetup_change
282 ** Adminstrative screen used to view or edit the TH1 script
@@ -417,11 +417,11 @@
417
418 /*
419 ** Return the code used to generate the new ticket page
420 */
421 const char *ticket_newpage_code(void){
422 return db_get("ticket-newpage", zDefaultNew);
423 }
424
425 /*
426 ** WEBPAGE: tktsetup_newpage
427 ** Administrative page used to view or edit the TH1 script used
@@ -558,11 +558,11 @@
558
559 /*
560 ** Return the code used to generate the view ticket page
561 */
562 const char *ticket_viewpage_code(void){
563 return db_get("ticket-viewpage", zDefaultView);
564 }
565
566 /*
567 ** WEBPAGE: tktsetup_viewpage
568 ** Administrative page used to view or edit the TH1 script that
@@ -699,11 +699,11 @@
699
700 /*
701 ** Return the code used to generate the edit ticket page
702 */
703 const char *ticket_editpage_code(void){
704 return db_get("ticket-editpage", zDefaultEdit);
705 }
706
707 /*
708 ** WEBPAGE: tktsetup_editpage
709 ** Administrative page for viewing or editing the TH1 script that
@@ -755,11 +755,11 @@
755
756 /*
757 ** Return the code used to generate the report list
758 */
759 const char *ticket_reportlist_code(void){
760 return db_get("ticket-reportlist", zDefaultReportList);
761 }
762
763 /*
764 ** WEBPAGE: tktsetup_reportlist
765 ** Administrative page used to view or edit the TH1 script that
@@ -848,11 +848,11 @@
848
849 /*
850 ** Return the template ticket report format:
851 */
852 const char *ticket_key_template(void){
853 return db_get("ticket-key-template", zDefaultKey);
854 }
855
856 /*
857 ** WEBPAGE: tktsetup_keytplt
858 **
859
M src/xfersetup.c
+1 -1
--- src/xfersetup.c
+++ src/xfersetup.c
@@ -114,11 +114,11 @@
114114
 cgi_redirect("xfersetup");
115115
 }
116116
 isSubmit = P("submit")!=0;
117117
 z = P("x");
118118
 if( z==0 ){
119
- z = db_get(zDbField, (char*)zDfltValue);
119
+ z = db_get(zDbField, zDfltValue);
120120
 }
121121
 style_header("Edit %s", zTitle);
122122
 if( P("clear")!=0 ){
123123
 login_verify_csrf_secret();
124124
 db_unset(zDbField, 0);
125125
--- src/xfersetup.c
+++ src/xfersetup.c
@@ -114,11 +114,11 @@
114 cgi_redirect("xfersetup");
115 }
116 isSubmit = P("submit")!=0;
117 z = P("x");
118 if( z==0 ){
119 z = db_get(zDbField, (char*)zDfltValue);
120 }
121 style_header("Edit %s", zTitle);
122 if( P("clear")!=0 ){
123 login_verify_csrf_secret();
124 db_unset(zDbField, 0);
125
--- src/xfersetup.c
+++ src/xfersetup.c
@@ -114,11 +114,11 @@
114 cgi_redirect("xfersetup");
115 }
116 isSubmit = P("submit")!=0;
117 z = P("x");
118 if( z==0 ){
119 z = db_get(zDbField, zDfltValue);
120 }
121 style_header("Edit %s", zTitle);
122 if( P("clear")!=0 ){
123 login_verify_csrf_secret();
124 db_unset(zDbField, 0);
125

Keyboard Shortcuts

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