Fossil SCM
merge trunk
Commit
3cf9f2112d1042eb9e604ae6e855b64f6cf076eb
Parent
f332f83b15e5735…
2 files changed
+1
-1
-19
+1
-1
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -1187,11 +1187,11 @@ | ||
| 1187 | 1187 | } |
| 1188 | 1188 | } |
| 1189 | 1189 | db_finalize(&q); |
| 1190 | 1190 | blob_appendf(pOut, "\n"); |
| 1191 | 1191 | } |
| 1192 | - fossil_free(zDate); | |
| 1192 | + free(zDate); | |
| 1193 | 1193 | |
| 1194 | 1194 | db_prepare(&q, |
| 1195 | 1195 | "SELECT CASE vmerge.id WHEN -1 THEN '+' ELSE '-' END || blob.uuid, merge" |
| 1196 | 1196 | " FROM vmerge, blob" |
| 1197 | 1197 | " WHERE (vmerge.id=-1 OR vmerge.id=-2)" |
| 1198 | 1198 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -1187,11 +1187,11 @@ | |
| 1187 | } |
| 1188 | } |
| 1189 | db_finalize(&q); |
| 1190 | blob_appendf(pOut, "\n"); |
| 1191 | } |
| 1192 | fossil_free(zDate); |
| 1193 | |
| 1194 | db_prepare(&q, |
| 1195 | "SELECT CASE vmerge.id WHEN -1 THEN '+' ELSE '-' END || blob.uuid, merge" |
| 1196 | " FROM vmerge, blob" |
| 1197 | " WHERE (vmerge.id=-1 OR vmerge.id=-2)" |
| 1198 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -1187,11 +1187,11 @@ | |
| 1187 | } |
| 1188 | } |
| 1189 | db_finalize(&q); |
| 1190 | blob_appendf(pOut, "\n"); |
| 1191 | } |
| 1192 | free(zDate); |
| 1193 | |
| 1194 | db_prepare(&q, |
| 1195 | "SELECT CASE vmerge.id WHEN -1 THEN '+' ELSE '-' END || blob.uuid, merge" |
| 1196 | " FROM vmerge, blob" |
| 1197 | " WHERE (vmerge.id=-1 OR vmerge.id=-2)" |
| 1198 |
-19
| --- src/glob.c | ||
| +++ src/glob.c | ||
| @@ -138,29 +138,10 @@ | ||
| 138 | 138 | z += i+1; |
| 139 | 139 | } |
| 140 | 140 | return p; |
| 141 | 141 | } |
| 142 | 142 | |
| 143 | -/* | |
| 144 | -** Return non-zero if string z matches glob pattern zGlob and zero if the | |
| 145 | -** pattern does not match. | |
| 146 | -** | |
| 147 | -** Globbing rules: | |
| 148 | -** | |
| 149 | -** '*' Matches any sequence of zero or more characters. | |
| 150 | -** | |
| 151 | -** '?' Matches exactly one character. | |
| 152 | -** | |
| 153 | -** [...] Matches one character from the enclosed list of | |
| 154 | -** characters. | |
| 155 | -** | |
| 156 | -** [^...] Matches one character not in the enclosed list. | |
| 157 | -*/ | |
| 158 | -int strglob(const char *zGlob, const char *z){ | |
| 159 | - return sqlite3_strglob(zGlob, z)==0; | |
| 160 | -} | |
| 161 | - | |
| 162 | 143 | /* |
| 163 | 144 | ** Return true (non-zero) if zString matches any of the patterns in |
| 164 | 145 | ** the Glob. The value returned is actually a 1-based index of the pattern |
| 165 | 146 | ** that matched. Return 0 if none of the patterns match zString. |
| 166 | 147 | ** |
| 167 | 148 |
| --- src/glob.c | |
| +++ src/glob.c | |
| @@ -138,29 +138,10 @@ | |
| 138 | z += i+1; |
| 139 | } |
| 140 | return p; |
| 141 | } |
| 142 | |
| 143 | /* |
| 144 | ** Return non-zero if string z matches glob pattern zGlob and zero if the |
| 145 | ** pattern does not match. |
| 146 | ** |
| 147 | ** Globbing rules: |
| 148 | ** |
| 149 | ** '*' Matches any sequence of zero or more characters. |
| 150 | ** |
| 151 | ** '?' Matches exactly one character. |
| 152 | ** |
| 153 | ** [...] Matches one character from the enclosed list of |
| 154 | ** characters. |
| 155 | ** |
| 156 | ** [^...] Matches one character not in the enclosed list. |
| 157 | */ |
| 158 | int strglob(const char *zGlob, const char *z){ |
| 159 | return sqlite3_strglob(zGlob, z)==0; |
| 160 | } |
| 161 | |
| 162 | /* |
| 163 | ** Return true (non-zero) if zString matches any of the patterns in |
| 164 | ** the Glob. The value returned is actually a 1-based index of the pattern |
| 165 | ** that matched. Return 0 if none of the patterns match zString. |
| 166 | ** |
| 167 |
| --- src/glob.c | |
| +++ src/glob.c | |
| @@ -138,29 +138,10 @@ | |
| 138 | z += i+1; |
| 139 | } |
| 140 | return p; |
| 141 | } |
| 142 | |
| 143 | /* |
| 144 | ** Return true (non-zero) if zString matches any of the patterns in |
| 145 | ** the Glob. The value returned is actually a 1-based index of the pattern |
| 146 | ** that matched. Return 0 if none of the patterns match zString. |
| 147 | ** |
| 148 |