Fossil SCM
Fixed json.c for g.url changes which could not have been caught by copy/paste b/c they are macro-generated.
Commit
bcae843a3fe65bd30b23bda0dd625f1afa8f9465
Parent
5fdad9bd8cebc34…
1 file changed
+14
-14
+14
-14
| --- src/json.c | ||
| +++ src/json.c | ||
| @@ -1275,15 +1275,15 @@ | ||
| 1275 | 1275 | INT(g, xlinkClusterOnly); |
| 1276 | 1276 | INT(g, fTimeFormat); |
| 1277 | 1277 | INT(g, markPrivate); |
| 1278 | 1278 | INT(g, clockSkewSeen); |
| 1279 | 1279 | INT(g, isHTTP); |
| 1280 | - INT(g, urlIsFile); | |
| 1281 | - INT(g, urlIsHttps); | |
| 1282 | - INT(g, urlIsSsh); | |
| 1283 | - INT(g, urlPort); | |
| 1284 | - INT(g, urlDfltPort); | |
| 1280 | + INT(g.url, isFile); | |
| 1281 | + INT(g.url, isHttps); | |
| 1282 | + INT(g.url, isSsh); | |
| 1283 | + INT(g.url, port); | |
| 1284 | + INT(g.url, dfltPort); | |
| 1285 | 1285 | INT(g, useLocalauth); |
| 1286 | 1286 | INT(g, noPswd); |
| 1287 | 1287 | INT(g, userUid); |
| 1288 | 1288 | INT(g, rcvid); |
| 1289 | 1289 | INT(g, okCsrf); |
| @@ -1299,19 +1299,19 @@ | ||
| 1299 | 1299 | CSTR(g, zExtra); |
| 1300 | 1300 | CSTR(g, zBaseURL); |
| 1301 | 1301 | CSTR(g, zTop); |
| 1302 | 1302 | CSTR(g, zContentType); |
| 1303 | 1303 | CSTR(g, zErrMsg); |
| 1304 | - CSTR(g, urlName); | |
| 1305 | - CSTR(g, urlHostname); | |
| 1306 | - CSTR(g, urlProtocol); | |
| 1307 | - CSTR(g, urlPath); | |
| 1308 | - CSTR(g, urlUser); | |
| 1309 | - CSTR(g, urlPasswd); | |
| 1310 | - CSTR(g, urlCanonical); | |
| 1311 | - CSTR(g, urlProxyAuth); | |
| 1312 | - CSTR(g, urlFossil); | |
| 1304 | + CSTR(g.url, name); | |
| 1305 | + CSTR(g.url, hostname); | |
| 1306 | + CSTR(g.url, protocol); | |
| 1307 | + CSTR(g.url, path); | |
| 1308 | + CSTR(g.url, user); | |
| 1309 | + CSTR(g.url, passwd); | |
| 1310 | + CSTR(g.url, canonical); | |
| 1311 | + CSTR(g.url, proxyAuth); | |
| 1312 | + CSTR(g.url, fossil); | |
| 1313 | 1313 | CSTR(g, zLogin); |
| 1314 | 1314 | CSTR(g, zSSLIdentity); |
| 1315 | 1315 | CSTR(g, zIpAddr); |
| 1316 | 1316 | CSTR(g, zNonce); |
| 1317 | 1317 | CSTR(g, zCsrfToken); |
| 1318 | 1318 |
| --- src/json.c | |
| +++ src/json.c | |
| @@ -1275,15 +1275,15 @@ | |
| 1275 | INT(g, xlinkClusterOnly); |
| 1276 | INT(g, fTimeFormat); |
| 1277 | INT(g, markPrivate); |
| 1278 | INT(g, clockSkewSeen); |
| 1279 | INT(g, isHTTP); |
| 1280 | INT(g, urlIsFile); |
| 1281 | INT(g, urlIsHttps); |
| 1282 | INT(g, urlIsSsh); |
| 1283 | INT(g, urlPort); |
| 1284 | INT(g, urlDfltPort); |
| 1285 | INT(g, useLocalauth); |
| 1286 | INT(g, noPswd); |
| 1287 | INT(g, userUid); |
| 1288 | INT(g, rcvid); |
| 1289 | INT(g, okCsrf); |
| @@ -1299,19 +1299,19 @@ | |
| 1299 | CSTR(g, zExtra); |
| 1300 | CSTR(g, zBaseURL); |
| 1301 | CSTR(g, zTop); |
| 1302 | CSTR(g, zContentType); |
| 1303 | CSTR(g, zErrMsg); |
| 1304 | CSTR(g, urlName); |
| 1305 | CSTR(g, urlHostname); |
| 1306 | CSTR(g, urlProtocol); |
| 1307 | CSTR(g, urlPath); |
| 1308 | CSTR(g, urlUser); |
| 1309 | CSTR(g, urlPasswd); |
| 1310 | CSTR(g, urlCanonical); |
| 1311 | CSTR(g, urlProxyAuth); |
| 1312 | CSTR(g, urlFossil); |
| 1313 | CSTR(g, zLogin); |
| 1314 | CSTR(g, zSSLIdentity); |
| 1315 | CSTR(g, zIpAddr); |
| 1316 | CSTR(g, zNonce); |
| 1317 | CSTR(g, zCsrfToken); |
| 1318 |
| --- src/json.c | |
| +++ src/json.c | |
| @@ -1275,15 +1275,15 @@ | |
| 1275 | INT(g, xlinkClusterOnly); |
| 1276 | INT(g, fTimeFormat); |
| 1277 | INT(g, markPrivate); |
| 1278 | INT(g, clockSkewSeen); |
| 1279 | INT(g, isHTTP); |
| 1280 | INT(g.url, isFile); |
| 1281 | INT(g.url, isHttps); |
| 1282 | INT(g.url, isSsh); |
| 1283 | INT(g.url, port); |
| 1284 | INT(g.url, dfltPort); |
| 1285 | INT(g, useLocalauth); |
| 1286 | INT(g, noPswd); |
| 1287 | INT(g, userUid); |
| 1288 | INT(g, rcvid); |
| 1289 | INT(g, okCsrf); |
| @@ -1299,19 +1299,19 @@ | |
| 1299 | CSTR(g, zExtra); |
| 1300 | CSTR(g, zBaseURL); |
| 1301 | CSTR(g, zTop); |
| 1302 | CSTR(g, zContentType); |
| 1303 | CSTR(g, zErrMsg); |
| 1304 | CSTR(g.url, name); |
| 1305 | CSTR(g.url, hostname); |
| 1306 | CSTR(g.url, protocol); |
| 1307 | CSTR(g.url, path); |
| 1308 | CSTR(g.url, user); |
| 1309 | CSTR(g.url, passwd); |
| 1310 | CSTR(g.url, canonical); |
| 1311 | CSTR(g.url, proxyAuth); |
| 1312 | CSTR(g.url, fossil); |
| 1313 | CSTR(g, zLogin); |
| 1314 | CSTR(g, zSSLIdentity); |
| 1315 | CSTR(g, zIpAddr); |
| 1316 | CSTR(g, zNonce); |
| 1317 | CSTR(g, zCsrfToken); |
| 1318 |