Fossil SCM
json API: removed reference to recently-removed DIFF_CONTEXT_MASK.
Commit
0c496d8ad35a8a87f6b707dcea19fe5f781d223139972601c07159a7a4585c0f
Parent
6f5dfd9d800e692…
1 file changed
+1
-2
+1
-2
| --- src/json_diff.c | ||
| +++ src/json_diff.c | ||
| @@ -41,12 +41,11 @@ | ||
| 41 | 41 | int toid; |
| 42 | 42 | int outLen; |
| 43 | 43 | DiffConfig DCfg; |
| 44 | 44 | Blob from = empty_blob, to = empty_blob, out = empty_blob; |
| 45 | 45 | cson_value * rc = NULL; |
| 46 | - int flags = (DIFF_CONTEXT_MASK & nContext) | |
| 47 | - | (fSbs ? DIFF_SIDEBYSIDE : 0) | |
| 46 | + int flags = (fSbs ? DIFF_SIDEBYSIDE : 0) | |
| 48 | 47 | | (fHtml ? DIFF_HTML : 0); |
| 49 | 48 | fromid = name_to_typed_rid(zFrom, "*"); |
| 50 | 49 | if(fromid<=0){ |
| 51 | 50 | json_set_err(FSL_JSON_E_UNRESOLVED_UUID, |
| 52 | 51 | "Could not resolve 'from' ID."); |
| 53 | 52 |
| --- src/json_diff.c | |
| +++ src/json_diff.c | |
| @@ -41,12 +41,11 @@ | |
| 41 | int toid; |
| 42 | int outLen; |
| 43 | DiffConfig DCfg; |
| 44 | Blob from = empty_blob, to = empty_blob, out = empty_blob; |
| 45 | cson_value * rc = NULL; |
| 46 | int flags = (DIFF_CONTEXT_MASK & nContext) |
| 47 | | (fSbs ? DIFF_SIDEBYSIDE : 0) |
| 48 | | (fHtml ? DIFF_HTML : 0); |
| 49 | fromid = name_to_typed_rid(zFrom, "*"); |
| 50 | if(fromid<=0){ |
| 51 | json_set_err(FSL_JSON_E_UNRESOLVED_UUID, |
| 52 | "Could not resolve 'from' ID."); |
| 53 |
| --- src/json_diff.c | |
| +++ src/json_diff.c | |
| @@ -41,12 +41,11 @@ | |
| 41 | int toid; |
| 42 | int outLen; |
| 43 | DiffConfig DCfg; |
| 44 | Blob from = empty_blob, to = empty_blob, out = empty_blob; |
| 45 | cson_value * rc = NULL; |
| 46 | int flags = (fSbs ? DIFF_SIDEBYSIDE : 0) |
| 47 | | (fHtml ? DIFF_HTML : 0); |
| 48 | fromid = name_to_typed_rid(zFrom, "*"); |
| 49 | if(fromid<=0){ |
| 50 | json_set_err(FSL_JSON_E_UNRESOLVED_UUID, |
| 51 | "Could not resolve 'from' ID."); |
| 52 |