Fossil SCM

Use #define constants instead of numbers to improve readability of code.

andybradford 2016-10-01 04:21 trunk
Commit 68b53604bbd512ec310810119543edbb58cdc0fb
Parent 2ccd046de2dad79…
1 file changed +24 -15
~ src/timeline.c
M src/timeline.c
+24 -15
--- src/timeline.c
+++ src/timeline.c
@@ -26,10 +26,19 @@
2626
 /*
2727
 ** The value of one second in julianday notation
2828
 */
2929
 #define ONE_SECOND (1.0/86400.0)
3030
31
+/*
32
+** timeline mode options
33
+*/
34
+#define TIMELINE_MODE_NONE 0
35
+#define TIMELINE_MODE_BEFORE 1
36
+#define TIMELINE_MODE_AFTER 2
37
+#define TIMELINE_MODE_CHILDREN 3
38
+#define TIMELINE_MODE_PARENTS 4
39
+
3140
 /*
3241
 ** Add an appropriate tag to the output if "rid" is unpublished (private)
3342
 */
3443
 #define UNPUB_TAG "<em>(unpublished)</em>"
3544
 void tag_private_status(int rid){
@@ -2087,11 +2096,11 @@
20872096
 char *zOrigin;
20882097
 char *zDate;
20892098
 Blob sql;
20902099
 int objid = 0;
20912100
 Blob uuid;
2092
- int mode = 0 ; /* 0:none 1: before 2:after 3:children 4:parents */
2101
+ int mode = TIMELINE_MODE_NONE;
20932102
 int verboseFlag = 0 ;
20942103
 int iOffset;
20952104
 const char *zFilePattern = 0;
20962105
 Blob treeName;
20972106
@@ -2128,21 +2137,21 @@
21282137
 verify_all_options();
21292138
21302139
 if( g.argc>=4 ){
21312140
 k = strlen(g.argv[2]);
21322141
 if( strncmp(g.argv[2],"before",k)==0 ){
2133
- mode = 1;
2142
+ mode = TIMELINE_MODE_BEFORE;
21342143
 }else if( strncmp(g.argv[2],"after",k)==0 && k>1 ){
2135
- mode = 2;
2144
+ mode = TIMELINE_MODE_AFTER;
21362145
 }else if( strncmp(g.argv[2],"descendants",k)==0 ){
2137
- mode = 3;
2146
+ mode = TIMELINE_MODE_CHILDREN;
21382147
 }else if( strncmp(g.argv[2],"children",k)==0 ){
2139
- mode = 3;
2148
+ mode = TIMELINE_MODE_CHILDREN;
21402149
 }else if( strncmp(g.argv[2],"ancestors",k)==0 && k>1 ){
2141
- mode = 4;
2150
+ mode = TIMELINE_MODE_PARENTS;
21422151
 }else if( strncmp(g.argv[2],"parents",k)==0 ){
2143
- mode = 4;
2152
+ mode = TIMELINE_MODE_PARENTS;
21442153
 }else if(!zType && !zLimit){
21452154
 usage("?WHEN? ?CHECKIN|DATETIME? ?-n|--limit #? ?-t|--type TYPE? "
21462155
 "?-W|--width WIDTH? ?-p|--path PATH");
21472156
 }
21482157
 if( '-' != *g.argv[3] ){
@@ -2157,11 +2166,11 @@
21572166
 }
21582167
 k = strlen(zOrigin);
21592168
 blob_zero(&uuid);
21602169
 blob_append(&uuid, zOrigin, -1);
21612170
 if( fossil_strcmp(zOrigin, "now")==0 ){
2162
- if( mode==3 || mode==4 ){
2171
+ if( mode==TIMELINE_MODE_CHILDREN || mode==TIMELINE_MODE_PARENTS ){
21632172
 fossil_fatal("cannot compute descendants or ancestors of a date");
21642173
 }
21652174
 zDate = mprintf("(SELECT datetime('now'))");
21662175
 }else if( strncmp(zOrigin, "current", k)==0 ){
21672176
 if( !g.localOpen ){
@@ -2172,14 +2181,14 @@
21722181
 }else if( name_to_uuid(&uuid, 0, "*")==0 ){
21732182
 objid = db_int(0, "SELECT rid FROM blob WHERE uuid=%B", &uuid);
21742183
 zDate = mprintf("(SELECT mtime FROM event WHERE objid=%d)", objid);
21752184
 }else{
21762185
 const char *zShift = "";
2177
- if( mode==3 || mode==4 ){
2186
+ if( mode==TIMELINE_MODE_CHILDREN || mode==TIMELINE_MODE_PARENTS ){
21782187
 fossil_fatal("cannot compute descendants or ancestors of a date");
21792188
 }
2180
- if( mode==0 ){
2189
+ if( mode==TIMELINE_MODE_NONE ){
21812190
 if( isIsoDate(zOrigin) ) zShift = ",'+1 day'";
21822191
 }
21832192
 zDate = mprintf("(SELECT julianday(%Q%s, fromLocal()))", zOrigin, zShift);
21842193
 }
21852194
@@ -2195,21 +2204,21 @@
21952204
 * zFilePattern. */
21962205
 zFilePattern = 0;
21972206
 }
21982207
 }
21992208
2200
- if( mode==0 ) mode = 1;
2209
+ if( mode==TIMELINE_MODE_NONE ) mode = TIMELINE_MODE_BEFORE;
22012210
 blob_zero(&sql);
22022211
 blob_append(&sql, timeline_query_for_tty(), -1);
22032212
 blob_append_sql(&sql, "\n AND event.mtime %s %s",
2204
- (mode==1 || mode==4) ? "<=" : ">=",
2205
- zDate /*safe-for-%s*/
2213
+ ( mode==TIMELINE_MODE_BEFORE ||
2214
+ mode==TIMELINE_MODE_PARENTS ) ? "<=" : ">=", zDate /*safe-for-%s*/
22062215
 );
22072216
2208
- if( mode==3 || mode==4 ){
2217
+ if( mode==TIMELINE_MODE_CHILDREN || mode==TIMELINE_MODE_PARENTS ){
22092218
 db_multi_exec("CREATE TEMP TABLE ok(rid INTEGER PRIMARY KEY)");
2210
- if( mode==3 ){
2219
+ if( mode==TIMELINE_MODE_CHILDREN ){
22112220
 compute_descendants(objid, n);
22122221
 }else{
22132222
 compute_ancestors(objid, n, 0);
22142223
 }
22152224
 blob_append_sql(&sql, "\n AND blob.rid IN ok");
22162225
--- src/timeline.c
+++ src/timeline.c
@@ -26,10 +26,19 @@
26 /*
27 ** The value of one second in julianday notation
28 */
29 #define ONE_SECOND (1.0/86400.0)
30
 
 
 
 
 
 
 
 
 
31 /*
32 ** Add an appropriate tag to the output if "rid" is unpublished (private)
33 */
34 #define UNPUB_TAG "<em>(unpublished)</em>"
35 void tag_private_status(int rid){
@@ -2087,11 +2096,11 @@
2087 char *zOrigin;
2088 char *zDate;
2089 Blob sql;
2090 int objid = 0;
2091 Blob uuid;
2092 int mode = 0 ; /* 0:none 1: before 2:after 3:children 4:parents */
2093 int verboseFlag = 0 ;
2094 int iOffset;
2095 const char *zFilePattern = 0;
2096 Blob treeName;
2097
@@ -2128,21 +2137,21 @@
2128 verify_all_options();
2129
2130 if( g.argc>=4 ){
2131 k = strlen(g.argv[2]);
2132 if( strncmp(g.argv[2],"before",k)==0 ){
2133 mode = 1;
2134 }else if( strncmp(g.argv[2],"after",k)==0 && k>1 ){
2135 mode = 2;
2136 }else if( strncmp(g.argv[2],"descendants",k)==0 ){
2137 mode = 3;
2138 }else if( strncmp(g.argv[2],"children",k)==0 ){
2139 mode = 3;
2140 }else if( strncmp(g.argv[2],"ancestors",k)==0 && k>1 ){
2141 mode = 4;
2142 }else if( strncmp(g.argv[2],"parents",k)==0 ){
2143 mode = 4;
2144 }else if(!zType && !zLimit){
2145 usage("?WHEN? ?CHECKIN|DATETIME? ?-n|--limit #? ?-t|--type TYPE? "
2146 "?-W|--width WIDTH? ?-p|--path PATH");
2147 }
2148 if( '-' != *g.argv[3] ){
@@ -2157,11 +2166,11 @@
2157 }
2158 k = strlen(zOrigin);
2159 blob_zero(&uuid);
2160 blob_append(&uuid, zOrigin, -1);
2161 if( fossil_strcmp(zOrigin, "now")==0 ){
2162 if( mode==3 || mode==4 ){
2163 fossil_fatal("cannot compute descendants or ancestors of a date");
2164 }
2165 zDate = mprintf("(SELECT datetime('now'))");
2166 }else if( strncmp(zOrigin, "current", k)==0 ){
2167 if( !g.localOpen ){
@@ -2172,14 +2181,14 @@
2172 }else if( name_to_uuid(&uuid, 0, "*")==0 ){
2173 objid = db_int(0, "SELECT rid FROM blob WHERE uuid=%B", &uuid);
2174 zDate = mprintf("(SELECT mtime FROM event WHERE objid=%d)", objid);
2175 }else{
2176 const char *zShift = "";
2177 if( mode==3 || mode==4 ){
2178 fossil_fatal("cannot compute descendants or ancestors of a date");
2179 }
2180 if( mode==0 ){
2181 if( isIsoDate(zOrigin) ) zShift = ",'+1 day'";
2182 }
2183 zDate = mprintf("(SELECT julianday(%Q%s, fromLocal()))", zOrigin, zShift);
2184 }
2185
@@ -2195,21 +2204,21 @@
2195 * zFilePattern. */
2196 zFilePattern = 0;
2197 }
2198 }
2199
2200 if( mode==0 ) mode = 1;
2201 blob_zero(&sql);
2202 blob_append(&sql, timeline_query_for_tty(), -1);
2203 blob_append_sql(&sql, "\n AND event.mtime %s %s",
2204 (mode==1 || mode==4) ? "<=" : ">=",
2205 zDate /*safe-for-%s*/
2206 );
2207
2208 if( mode==3 || mode==4 ){
2209 db_multi_exec("CREATE TEMP TABLE ok(rid INTEGER PRIMARY KEY)");
2210 if( mode==3 ){
2211 compute_descendants(objid, n);
2212 }else{
2213 compute_ancestors(objid, n, 0);
2214 }
2215 blob_append_sql(&sql, "\n AND blob.rid IN ok");
2216
--- src/timeline.c
+++ src/timeline.c
@@ -26,10 +26,19 @@
26 /*
27 ** The value of one second in julianday notation
28 */
29 #define ONE_SECOND (1.0/86400.0)
30
31 /*
32 ** timeline mode options
33 */
34 #define TIMELINE_MODE_NONE 0
35 #define TIMELINE_MODE_BEFORE 1
36 #define TIMELINE_MODE_AFTER 2
37 #define TIMELINE_MODE_CHILDREN 3
38 #define TIMELINE_MODE_PARENTS 4
39
40 /*
41 ** Add an appropriate tag to the output if "rid" is unpublished (private)
42 */
43 #define UNPUB_TAG "<em>(unpublished)</em>"
44 void tag_private_status(int rid){
@@ -2087,11 +2096,11 @@
2096 char *zOrigin;
2097 char *zDate;
2098 Blob sql;
2099 int objid = 0;
2100 Blob uuid;
2101 int mode = TIMELINE_MODE_NONE;
2102 int verboseFlag = 0 ;
2103 int iOffset;
2104 const char *zFilePattern = 0;
2105 Blob treeName;
2106
@@ -2128,21 +2137,21 @@
2137 verify_all_options();
2138
2139 if( g.argc>=4 ){
2140 k = strlen(g.argv[2]);
2141 if( strncmp(g.argv[2],"before",k)==0 ){
2142 mode = TIMELINE_MODE_BEFORE;
2143 }else if( strncmp(g.argv[2],"after",k)==0 && k>1 ){
2144 mode = TIMELINE_MODE_AFTER;
2145 }else if( strncmp(g.argv[2],"descendants",k)==0 ){
2146 mode = TIMELINE_MODE_CHILDREN;
2147 }else if( strncmp(g.argv[2],"children",k)==0 ){
2148 mode = TIMELINE_MODE_CHILDREN;
2149 }else if( strncmp(g.argv[2],"ancestors",k)==0 && k>1 ){
2150 mode = TIMELINE_MODE_PARENTS;
2151 }else if( strncmp(g.argv[2],"parents",k)==0 ){
2152 mode = TIMELINE_MODE_PARENTS;
2153 }else if(!zType && !zLimit){
2154 usage("?WHEN? ?CHECKIN|DATETIME? ?-n|--limit #? ?-t|--type TYPE? "
2155 "?-W|--width WIDTH? ?-p|--path PATH");
2156 }
2157 if( '-' != *g.argv[3] ){
@@ -2157,11 +2166,11 @@
2166 }
2167 k = strlen(zOrigin);
2168 blob_zero(&uuid);
2169 blob_append(&uuid, zOrigin, -1);
2170 if( fossil_strcmp(zOrigin, "now")==0 ){
2171 if( mode==TIMELINE_MODE_CHILDREN || mode==TIMELINE_MODE_PARENTS ){
2172 fossil_fatal("cannot compute descendants or ancestors of a date");
2173 }
2174 zDate = mprintf("(SELECT datetime('now'))");
2175 }else if( strncmp(zOrigin, "current", k)==0 ){
2176 if( !g.localOpen ){
@@ -2172,14 +2181,14 @@
2181 }else if( name_to_uuid(&uuid, 0, "*")==0 ){
2182 objid = db_int(0, "SELECT rid FROM blob WHERE uuid=%B", &uuid);
2183 zDate = mprintf("(SELECT mtime FROM event WHERE objid=%d)", objid);
2184 }else{
2185 const char *zShift = "";
2186 if( mode==TIMELINE_MODE_CHILDREN || mode==TIMELINE_MODE_PARENTS ){
2187 fossil_fatal("cannot compute descendants or ancestors of a date");
2188 }
2189 if( mode==TIMELINE_MODE_NONE ){
2190 if( isIsoDate(zOrigin) ) zShift = ",'+1 day'";
2191 }
2192 zDate = mprintf("(SELECT julianday(%Q%s, fromLocal()))", zOrigin, zShift);
2193 }
2194
@@ -2195,21 +2204,21 @@
2204 * zFilePattern. */
2205 zFilePattern = 0;
2206 }
2207 }
2208
2209 if( mode==TIMELINE_MODE_NONE ) mode = TIMELINE_MODE_BEFORE;
2210 blob_zero(&sql);
2211 blob_append(&sql, timeline_query_for_tty(), -1);
2212 blob_append_sql(&sql, "\n AND event.mtime %s %s",
2213 ( mode==TIMELINE_MODE_BEFORE ||
2214 mode==TIMELINE_MODE_PARENTS ) ? "<=" : ">=", zDate /*safe-for-%s*/
2215 );
2216
2217 if( mode==TIMELINE_MODE_CHILDREN || mode==TIMELINE_MODE_PARENTS ){
2218 db_multi_exec("CREATE TEMP TABLE ok(rid INTEGER PRIMARY KEY)");
2219 if( mode==TIMELINE_MODE_CHILDREN ){
2220 compute_descendants(objid, n);
2221 }else{
2222 compute_ancestors(objid, n, 0);
2223 }
2224 blob_append_sql(&sql, "\n AND blob.rid IN ok");
2225

Keyboard Shortcuts

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