Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | unused variable includeDotFiles <p>struct utimbuf -> struct _utimbuf (compiler warning with mingw-w64) <p>a few "const" additions (lower memory footprint, allows C-compiler to optimize better) |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
6032dd51f2bca8f714a4b499888707fe |
| User & Date: | jan.nijtmans 2012-10-16 01:11:43.794 |
Context
|
2012-10-17
| ||
| 14:04 | I think I fix the previous commit, that should avoid committing a ticket manifest if it has no changes. It was ignoring the ticket appends. In the case of only appending, the user was not notified not properly redirected, and the ticket chagnes were not committed. Still, there should be some kind of warning to the user, if it ends up in such situation, I think. check-in: f02946aa8b user: viriketo tags: trunk | |
|
2012-10-16
| ||
| 23:14 | Merge updates from trunk. check-in: ce3b312a15 user: mistachkin tags: tclRdOnly | |
| 12:19 | Updating from trunk. check-in: 3cdf9480dd user: viriketo tags: annotate_links | |
| 01:22 | merge trunk check-in: 7f939bd8d7 user: jan.nijtmans tags: use-utf8-in-win-external-editor | |
| 01:11 | unused variable includeDotFiles <p>struct utimbuf -> struct _utimbuf (compiler warning with mingw-w64) <p>a few "const" additions (lower memory footprint, allows C-compiler to optimize better) check-in: 6032dd51f2 user: jan.nijtmans tags: trunk | |
|
2012-10-15
| ||
| 15:10 | Avoid entering a ticket-change artifact that does not specify any changes. check-in: 7097562813 user: drh tags: trunk | |
Changes
Changes to src/add.c.
| ︙ | ︙ | |||
19 20 21 22 23 24 25 | ** from the local repository. */ #include "config.h" #include "add.h" #include <assert.h> #include <dirent.h> | < < < < < < | | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 |
** from the local repository.
*/
#include "config.h"
#include "add.h"
#include <assert.h>
#include <dirent.h>
/*
** This routine returns the names of files in a working checkout that
** are created by Fossil itself, and hence should not be added, deleted,
** or merge, and should be omitted from "clean" and "extra" lists.
**
** Return the N-th name. The first name has N==0. When all names have
** been used, return 0.
*/
const char *fossil_reserved_name(int N){
/* Possible names of the local per-checkout database file and
** its associated journals
*/
static const char *const azName[] = {
"_FOSSIL_",
"_FOSSIL_-journal",
"_FOSSIL_-wal",
"_FOSSIL_-shm",
".fslckout",
".fslckout-journal",
".fslckout-wal",
|
| ︙ | ︙ | |||
59 60 61 62 63 64 65 |
".fos-wal",
".fos-shm",
};
/* Names of auxiliary files generated by SQLite when the "manifest"
** properity is enabled
*/
| | | 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 |
".fos-wal",
".fos-shm",
};
/* Names of auxiliary files generated by SQLite when the "manifest"
** properity is enabled
*/
static const char *const azManifest[] = {
"manifest",
"manifest.uuid",
};
/* Cached setting "manifest" */
static int cachedManifest = -1;
|
| ︙ | ︙ |
Changes to src/captcha.c.
| ︙ | ︙ | |||
96 97 98 99 100 101 102 | z[k] = 0; return z; } #endif /* CAPTCHA==1 */ #if CAPTCHA==2 | | | 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 |
z[k] = 0;
return z;
}
#endif /* CAPTCHA==1 */
#if CAPTCHA==2
static const char *const azFont2[] = {
/* 0 */
" __ ",
" / \\ ",
"| () |",
" \\__/ ",
/* 1 */
|
| ︙ | ︙ | |||
221 222 223 224 225 226 227 | } z[k] = 0; return z; } #endif /* CAPTCHA==2 */ #if CAPTCHA==3 | | | 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 |
}
z[k] = 0;
return z;
}
#endif /* CAPTCHA==2 */
#if CAPTCHA==3
static const char *const azFont3[] = {
/* 0 */
" ___ ",
" / _ \\ ",
"| | | |",
"| | | |",
"| |_| |",
" \\___/ ",
|
| ︙ | ︙ |
Changes to src/cgi.c.
| ︙ | ︙ | |||
1352 1353 1354 1355 1356 1357 1358 | return 0; } /* ** Name of days and months. */ | | | | 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 |
return 0;
}
/*
** Name of days and months.
*/
static const char *const azDays[] =
{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", 0};
static const char *const azMonths[] =
{"Jan", "Feb", "Mar", "Apr", "May", "Jun",
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec", 0};
/*
** Returns an RFC822-formatted time string suitable for HTTP headers.
** The timezone is always GMT. The value returned is always a
|
| ︙ | ︙ |
Changes to src/db.c.
| ︙ | ︙ | |||
1607 1608 1609 1610 1611 1612 1613 |
}
}
/*
** Return true if the string zVal represents "true" (or "false").
*/
int is_truth(const char *zVal){
| | | | 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 |
}
}
/*
** Return true if the string zVal represents "true" (or "false").
*/
int is_truth(const char *zVal){
static const char *const azOn[] = { "on", "yes", "true", "1" };
int i;
for(i=0; i<sizeof(azOn)/sizeof(azOn[0]); i++){
if( fossil_stricmp(zVal,azOn[i])==0 ) return 1;
}
return 0;
}
int is_false(const char *zVal){
static const char *const azOff[] = { "off", "no", "false", "0" };
int i;
for(i=0; i<sizeof(azOff)/sizeof(azOff[0]); i++){
if( fossil_stricmp(zVal,azOff[i])==0 ) return 1;
}
return 0;
}
|
| ︙ | ︙ |
Changes to src/file.c.
| ︙ | ︙ | |||
400 401 402 403 404 405 406 | #if !defined(_WIN32) struct timeval tv[2]; memset(tv, 0, sizeof(tv[0])*2); tv[0].tv_sec = newMTime; tv[1].tv_sec = newMTime; utimes(zFilename, tv); #else | | | 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 | #if !defined(_WIN32) struct timeval tv[2]; memset(tv, 0, sizeof(tv[0])*2); tv[0].tv_sec = newMTime; tv[1].tv_sec = newMTime; utimes(zFilename, tv); #else struct _utimbuf tb; wchar_t *zMbcs = fossil_utf8_to_unicode(zFilename); tb.actime = newMTime; tb.modtime = newMTime; _wutime(zMbcs, &tb); fossil_mbcs_free(zMbcs); #endif } |
| ︙ | ︙ |
Changes to src/report.c.
| ︙ | ︙ | |||
168 169 170 171 172 173 174 |
}
switch( code ){
case SQLITE_SELECT:
case SQLITE_FUNCTION: {
break;
}
case SQLITE_READ: {
| | | 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 |
}
switch( code ){
case SQLITE_SELECT:
case SQLITE_FUNCTION: {
break;
}
case SQLITE_READ: {
static const char *const azAllowed[] = {
"ticket",
"blob",
"filename",
"mlink",
"plink",
"event",
"tag",
|
| ︙ | ︙ |
Changes to src/vfile.c.
| ︙ | ︙ | |||
383 384 385 386 387 388 389 |
return fileFound;
}
/*
** Return TRUE if zFile is a temporary file. Return FALSE if not.
*/
static int is_temporary_file(const char *zName){
| | | 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 |
return fileFound;
}
/*
** Return TRUE if zFile is a temporary file. Return FALSE if not.
*/
static int is_temporary_file(const char *zName){
static const char *const azTemp[] = {
"baseline",
"merge",
"original",
"output",
};
int i, j, n;
|
| ︙ | ︙ |
Changes to src/xfer.c.
| ︙ | ︙ | |||
268 269 270 271 272 273 274 |
static int send_delta_parent(
Xfer *pXfer, /* The transfer context */
int rid, /* record id of the file to send */
int isPrivate, /* True if rid is a private artifact */
Blob *pContent, /* The content of the file to send */
Blob *pUuid /* The UUID of the file to send */
){
| | | 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 |
static int send_delta_parent(
Xfer *pXfer, /* The transfer context */
int rid, /* record id of the file to send */
int isPrivate, /* True if rid is a private artifact */
Blob *pContent, /* The content of the file to send */
Blob *pUuid /* The UUID of the file to send */
){
static const char *const azQuery[] = {
"SELECT pid FROM plink x"
" WHERE cid=%d"
" AND NOT EXISTS(SELECT 1 FROM phantom WHERE rid=pid)"
" AND NOT EXISTS(SELECT 1 FROM plink y"
" WHERE y.pid=x.cid AND y.cid=x.pid)",
"SELECT pid FROM mlink x"
|
| ︙ | ︙ |