Fossil SCM
Styling: translate some tabs to spaces
Commit
b3e32c8e8bbdf7b68d47d9a5ce806a896852e7f4
Parent
64c21ef6860d49c…
8 files changed
+1
-1
+1
-1
+7
-7
+1
-1
+13
-13
+6
-6
+6
-6
+1
-1
+1
-1
| --- src/add.c | ||
| +++ src/add.c | ||
| @@ -548,11 +548,11 @@ | ||
| 548 | 548 | ** |
| 549 | 549 | ** The original name of the file is zOrig. The new filename is zNew. |
| 550 | 550 | */ |
| 551 | 551 | static void mv_one_file(int vid, const char *zOrig, const char *zNew){ |
| 552 | 552 | int x = db_int(-1, "SELECT deleted FROM vfile WHERE pathname=%Q %s", |
| 553 | - zNew, filename_collation()); | |
| 553 | + zNew, filename_collation()); | |
| 554 | 554 | if( x>=0 ){ |
| 555 | 555 | if( x==0 ){ |
| 556 | 556 | fossil_fatal("cannot rename '%s' to '%s' since another file named '%s'" |
| 557 | 557 | " is currently under management", zOrig, zNew, zNew); |
| 558 | 558 | }else{ |
| 559 | 559 |
| --- src/add.c | |
| +++ src/add.c | |
| @@ -548,11 +548,11 @@ | |
| 548 | ** |
| 549 | ** The original name of the file is zOrig. The new filename is zNew. |
| 550 | */ |
| 551 | static void mv_one_file(int vid, const char *zOrig, const char *zNew){ |
| 552 | int x = db_int(-1, "SELECT deleted FROM vfile WHERE pathname=%Q %s", |
| 553 | zNew, filename_collation()); |
| 554 | if( x>=0 ){ |
| 555 | if( x==0 ){ |
| 556 | fossil_fatal("cannot rename '%s' to '%s' since another file named '%s'" |
| 557 | " is currently under management", zOrig, zNew, zNew); |
| 558 | }else{ |
| 559 |
| --- src/add.c | |
| +++ src/add.c | |
| @@ -548,11 +548,11 @@ | |
| 548 | ** |
| 549 | ** The original name of the file is zOrig. The new filename is zNew. |
| 550 | */ |
| 551 | static void mv_one_file(int vid, const char *zOrig, const char *zNew){ |
| 552 | int x = db_int(-1, "SELECT deleted FROM vfile WHERE pathname=%Q %s", |
| 553 | zNew, filename_collation()); |
| 554 | if( x>=0 ){ |
| 555 | if( x==0 ){ |
| 556 | fossil_fatal("cannot rename '%s' to '%s' since another file named '%s'" |
| 557 | " is currently under management", zOrig, zNew, zNew); |
| 558 | }else{ |
| 559 |
+1
-1
| --- src/json_finfo.c | ||
| +++ src/json_finfo.c | ||
| @@ -74,11 +74,11 @@ | ||
| 74 | 74 | /*6*/ " (SELECT uuid FROM blob WHERE rid=mlink.pid)," /* Parent file uuid */ |
| 75 | 75 | /*7*/ " event.bgcolor," |
| 76 | 76 | /*8*/ " b.size," |
| 77 | 77 | /*9*/ " (mlink.pid==0) AS isNew," |
| 78 | 78 | /*10*/ " (mlink.fid==0) AS isDel" |
| 79 | - " FROM mlink, blob b, event, blob ci, filename" | |
| 79 | + " FROM mlink, blob b, event, blob ci, filename" | |
| 80 | 80 | " WHERE filename.name=%Q" |
| 81 | 81 | " AND mlink.fnid=filename.fnid" |
| 82 | 82 | " AND b.rid=mlink.fid" |
| 83 | 83 | " AND event.objid=mlink.mid" |
| 84 | 84 | " AND event.objid=ci.rid", |
| 85 | 85 |
| --- src/json_finfo.c | |
| +++ src/json_finfo.c | |
| @@ -74,11 +74,11 @@ | |
| 74 | /*6*/ " (SELECT uuid FROM blob WHERE rid=mlink.pid)," /* Parent file uuid */ |
| 75 | /*7*/ " event.bgcolor," |
| 76 | /*8*/ " b.size," |
| 77 | /*9*/ " (mlink.pid==0) AS isNew," |
| 78 | /*10*/ " (mlink.fid==0) AS isDel" |
| 79 | " FROM mlink, blob b, event, blob ci, filename" |
| 80 | " WHERE filename.name=%Q" |
| 81 | " AND mlink.fnid=filename.fnid" |
| 82 | " AND b.rid=mlink.fid" |
| 83 | " AND event.objid=mlink.mid" |
| 84 | " AND event.objid=ci.rid", |
| 85 |
| --- src/json_finfo.c | |
| +++ src/json_finfo.c | |
| @@ -74,11 +74,11 @@ | |
| 74 | /*6*/ " (SELECT uuid FROM blob WHERE rid=mlink.pid)," /* Parent file uuid */ |
| 75 | /*7*/ " event.bgcolor," |
| 76 | /*8*/ " b.size," |
| 77 | /*9*/ " (mlink.pid==0) AS isNew," |
| 78 | /*10*/ " (mlink.fid==0) AS isDel" |
| 79 | " FROM mlink, blob b, event, blob ci, filename" |
| 80 | " WHERE filename.name=%Q" |
| 81 | " AND mlink.fnid=filename.fnid" |
| 82 | " AND b.rid=mlink.fid" |
| 83 | " AND event.objid=mlink.mid" |
| 84 | " AND event.objid=ci.rid", |
| 85 |
+7
-7
| --- src/login.c | ||
| +++ src/login.c | ||
| @@ -474,11 +474,11 @@ | ||
| 474 | 474 | char *zSha1Pw; |
| 475 | 475 | const char *zIpAddr; /* IP address of requestor */ |
| 476 | 476 | |
| 477 | 477 | login_check_credentials(); |
| 478 | 478 | sqlite3_create_function(g.db, "constant_time_cmp", 2, SQLITE_UTF8, 0, |
| 479 | - constant_time_cmp_function, 0, 0); | |
| 479 | + constant_time_cmp_function, 0, 0); | |
| 480 | 480 | zUsername = P("u"); |
| 481 | 481 | zPasswd = P("p"); |
| 482 | 482 | anonFlag = P("anon")!=0; |
| 483 | 483 | if( P("out")!=0 ){ |
| 484 | 484 | login_clear_login_data(); |
| @@ -703,16 +703,16 @@ | ||
| 703 | 703 | if( zVfs==0 && sqlite3_libversion_number()>=3008001 ){ |
| 704 | 704 | zVfs = "win32-longpath"; |
| 705 | 705 | } |
| 706 | 706 | #endif |
| 707 | 707 | rc = sqlite3_open_v2(zOtherRepo, &pOther, |
| 708 | - SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, | |
| 709 | - zVfs); | |
| 708 | + SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, | |
| 709 | + zVfs); | |
| 710 | 710 | if( rc==SQLITE_OK ){ |
| 711 | 711 | sqlite3_create_function(pOther,"now",0,SQLITE_ANY,0,db_now_function,0,0); |
| 712 | 712 | sqlite3_create_function(pOther, "constant_time_cmp", 2, SQLITE_UTF8, 0, |
| 713 | - constant_time_cmp_function, 0, 0); | |
| 713 | + constant_time_cmp_function, 0, 0); | |
| 714 | 714 | sqlite3_busy_timeout(pOther, 5000); |
| 715 | 715 | zSQL = mprintf( |
| 716 | 716 | "SELECT cexpire FROM user" |
| 717 | 717 | " WHERE login=%Q" |
| 718 | 718 | " AND ipaddr=%Q" |
| @@ -793,11 +793,11 @@ | ||
| 793 | 793 | |
| 794 | 794 | /* Only run this check once. */ |
| 795 | 795 | if( g.userUid!=0 ) return; |
| 796 | 796 | |
| 797 | 797 | sqlite3_create_function(g.db, "constant_time_cmp", 2, SQLITE_UTF8, 0, |
| 798 | - constant_time_cmp_function, 0, 0); | |
| 798 | + constant_time_cmp_function, 0, 0); | |
| 799 | 799 | |
| 800 | 800 | /* If the HTTP connection is coming over 127.0.0.1 and if |
| 801 | 801 | ** local login is disabled and if we are using HTTP and not HTTPS, |
| 802 | 802 | ** then there is no need to check user credentials. |
| 803 | 803 | ** |
| @@ -1476,12 +1476,12 @@ | ||
| 1476 | 1476 | if( zVfs==0 && sqlite3_libversion_number()>=3008001 ){ |
| 1477 | 1477 | zVfs = "win32-longpath"; |
| 1478 | 1478 | } |
| 1479 | 1479 | #endif |
| 1480 | 1480 | rc = sqlite3_open_v2(zRepo, &pOther, |
| 1481 | - SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, | |
| 1482 | - zVfs); | |
| 1481 | + SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, | |
| 1482 | + zVfs); | |
| 1483 | 1483 | if( rc!=SQLITE_OK ){ |
| 1484 | 1484 | *pzErrMsg = mprintf(sqlite3_errmsg(pOther)); |
| 1485 | 1485 | }else{ |
| 1486 | 1486 | rc = sqlite3_exec(pOther, "SELECT count(*) FROM user", 0, 0, pzErrMsg); |
| 1487 | 1487 | } |
| 1488 | 1488 |
| --- src/login.c | |
| +++ src/login.c | |
| @@ -474,11 +474,11 @@ | |
| 474 | char *zSha1Pw; |
| 475 | const char *zIpAddr; /* IP address of requestor */ |
| 476 | |
| 477 | login_check_credentials(); |
| 478 | sqlite3_create_function(g.db, "constant_time_cmp", 2, SQLITE_UTF8, 0, |
| 479 | constant_time_cmp_function, 0, 0); |
| 480 | zUsername = P("u"); |
| 481 | zPasswd = P("p"); |
| 482 | anonFlag = P("anon")!=0; |
| 483 | if( P("out")!=0 ){ |
| 484 | login_clear_login_data(); |
| @@ -703,16 +703,16 @@ | |
| 703 | if( zVfs==0 && sqlite3_libversion_number()>=3008001 ){ |
| 704 | zVfs = "win32-longpath"; |
| 705 | } |
| 706 | #endif |
| 707 | rc = sqlite3_open_v2(zOtherRepo, &pOther, |
| 708 | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, |
| 709 | zVfs); |
| 710 | if( rc==SQLITE_OK ){ |
| 711 | sqlite3_create_function(pOther,"now",0,SQLITE_ANY,0,db_now_function,0,0); |
| 712 | sqlite3_create_function(pOther, "constant_time_cmp", 2, SQLITE_UTF8, 0, |
| 713 | constant_time_cmp_function, 0, 0); |
| 714 | sqlite3_busy_timeout(pOther, 5000); |
| 715 | zSQL = mprintf( |
| 716 | "SELECT cexpire FROM user" |
| 717 | " WHERE login=%Q" |
| 718 | " AND ipaddr=%Q" |
| @@ -793,11 +793,11 @@ | |
| 793 | |
| 794 | /* Only run this check once. */ |
| 795 | if( g.userUid!=0 ) return; |
| 796 | |
| 797 | sqlite3_create_function(g.db, "constant_time_cmp", 2, SQLITE_UTF8, 0, |
| 798 | constant_time_cmp_function, 0, 0); |
| 799 | |
| 800 | /* If the HTTP connection is coming over 127.0.0.1 and if |
| 801 | ** local login is disabled and if we are using HTTP and not HTTPS, |
| 802 | ** then there is no need to check user credentials. |
| 803 | ** |
| @@ -1476,12 +1476,12 @@ | |
| 1476 | if( zVfs==0 && sqlite3_libversion_number()>=3008001 ){ |
| 1477 | zVfs = "win32-longpath"; |
| 1478 | } |
| 1479 | #endif |
| 1480 | rc = sqlite3_open_v2(zRepo, &pOther, |
| 1481 | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, |
| 1482 | zVfs); |
| 1483 | if( rc!=SQLITE_OK ){ |
| 1484 | *pzErrMsg = mprintf(sqlite3_errmsg(pOther)); |
| 1485 | }else{ |
| 1486 | rc = sqlite3_exec(pOther, "SELECT count(*) FROM user", 0, 0, pzErrMsg); |
| 1487 | } |
| 1488 |
| --- src/login.c | |
| +++ src/login.c | |
| @@ -474,11 +474,11 @@ | |
| 474 | char *zSha1Pw; |
| 475 | const char *zIpAddr; /* IP address of requestor */ |
| 476 | |
| 477 | login_check_credentials(); |
| 478 | sqlite3_create_function(g.db, "constant_time_cmp", 2, SQLITE_UTF8, 0, |
| 479 | constant_time_cmp_function, 0, 0); |
| 480 | zUsername = P("u"); |
| 481 | zPasswd = P("p"); |
| 482 | anonFlag = P("anon")!=0; |
| 483 | if( P("out")!=0 ){ |
| 484 | login_clear_login_data(); |
| @@ -703,16 +703,16 @@ | |
| 703 | if( zVfs==0 && sqlite3_libversion_number()>=3008001 ){ |
| 704 | zVfs = "win32-longpath"; |
| 705 | } |
| 706 | #endif |
| 707 | rc = sqlite3_open_v2(zOtherRepo, &pOther, |
| 708 | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, |
| 709 | zVfs); |
| 710 | if( rc==SQLITE_OK ){ |
| 711 | sqlite3_create_function(pOther,"now",0,SQLITE_ANY,0,db_now_function,0,0); |
| 712 | sqlite3_create_function(pOther, "constant_time_cmp", 2, SQLITE_UTF8, 0, |
| 713 | constant_time_cmp_function, 0, 0); |
| 714 | sqlite3_busy_timeout(pOther, 5000); |
| 715 | zSQL = mprintf( |
| 716 | "SELECT cexpire FROM user" |
| 717 | " WHERE login=%Q" |
| 718 | " AND ipaddr=%Q" |
| @@ -793,11 +793,11 @@ | |
| 793 | |
| 794 | /* Only run this check once. */ |
| 795 | if( g.userUid!=0 ) return; |
| 796 | |
| 797 | sqlite3_create_function(g.db, "constant_time_cmp", 2, SQLITE_UTF8, 0, |
| 798 | constant_time_cmp_function, 0, 0); |
| 799 | |
| 800 | /* If the HTTP connection is coming over 127.0.0.1 and if |
| 801 | ** local login is disabled and if we are using HTTP and not HTTPS, |
| 802 | ** then there is no need to check user credentials. |
| 803 | ** |
| @@ -1476,12 +1476,12 @@ | |
| 1476 | if( zVfs==0 && sqlite3_libversion_number()>=3008001 ){ |
| 1477 | zVfs = "win32-longpath"; |
| 1478 | } |
| 1479 | #endif |
| 1480 | rc = sqlite3_open_v2(zRepo, &pOther, |
| 1481 | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, |
| 1482 | zVfs); |
| 1483 | if( rc!=SQLITE_OK ){ |
| 1484 | *pzErrMsg = mprintf(sqlite3_errmsg(pOther)); |
| 1485 | }else{ |
| 1486 | rc = sqlite3_exec(pOther, "SELECT count(*) FROM user", 0, 0, pzErrMsg); |
| 1487 | } |
| 1488 |
+1
-1
| --- src/md5.c | ||
| +++ src/md5.c | ||
| @@ -164,11 +164,11 @@ | ||
| 164 | 164 | /* |
| 165 | 165 | * Start MD5 accumulation. Set bit count to 0 and buffer to mysterious |
| 166 | 166 | * initialization constants. |
| 167 | 167 | */ |
| 168 | 168 | static void MD5Init(MD5Context *ctx){ |
| 169 | - ctx->isInit = 1; | |
| 169 | + ctx->isInit = 1; | |
| 170 | 170 | ctx->buf[0] = 0x67452301; |
| 171 | 171 | ctx->buf[1] = 0xefcdab89; |
| 172 | 172 | ctx->buf[2] = 0x98badcfe; |
| 173 | 173 | ctx->buf[3] = 0x10325476; |
| 174 | 174 | ctx->bits[0] = 0; |
| 175 | 175 |
| --- src/md5.c | |
| +++ src/md5.c | |
| @@ -164,11 +164,11 @@ | |
| 164 | /* |
| 165 | * Start MD5 accumulation. Set bit count to 0 and buffer to mysterious |
| 166 | * initialization constants. |
| 167 | */ |
| 168 | static void MD5Init(MD5Context *ctx){ |
| 169 | ctx->isInit = 1; |
| 170 | ctx->buf[0] = 0x67452301; |
| 171 | ctx->buf[1] = 0xefcdab89; |
| 172 | ctx->buf[2] = 0x98badcfe; |
| 173 | ctx->buf[3] = 0x10325476; |
| 174 | ctx->bits[0] = 0; |
| 175 |
| --- src/md5.c | |
| +++ src/md5.c | |
| @@ -164,11 +164,11 @@ | |
| 164 | /* |
| 165 | * Start MD5 accumulation. Set bit count to 0 and buffer to mysterious |
| 166 | * initialization constants. |
| 167 | */ |
| 168 | static void MD5Init(MD5Context *ctx){ |
| 169 | ctx->isInit = 1; |
| 170 | ctx->buf[0] = 0x67452301; |
| 171 | ctx->buf[1] = 0xefcdab89; |
| 172 | ctx->buf[2] = 0x98badcfe; |
| 173 | ctx->buf[3] = 0x10325476; |
| 174 | ctx->bits[0] = 0; |
| 175 |
+13
-13
| --- src/sha1.c | ||
| +++ src/sha1.c | ||
| @@ -161,20 +161,20 @@ | ||
| 161 | 161 | ){ |
| 162 | 162 | unsigned int i, j; |
| 163 | 163 | |
| 164 | 164 | j = context->count[0]; |
| 165 | 165 | if ((context->count[0] += len << 3) < j) |
| 166 | - context->count[1] += (len>>29)+1; | |
| 166 | + context->count[1] += (len>>29)+1; | |
| 167 | 167 | j = (j >> 3) & 63; |
| 168 | 168 | if ((j + len) > 63) { |
| 169 | - (void)memcpy(&context->buffer[j], data, (i = 64-j)); | |
| 170 | - SHA1Transform(context->state, context->buffer); | |
| 171 | - for ( ; i + 63 < len; i += 64) | |
| 172 | - SHA1Transform(context->state, &data[i]); | |
| 173 | - j = 0; | |
| 169 | + (void)memcpy(&context->buffer[j], data, (i = 64-j)); | |
| 170 | + SHA1Transform(context->state, context->buffer); | |
| 171 | + for ( ; i + 63 < len; i += 64) | |
| 172 | + SHA1Transform(context->state, &data[i]); | |
| 173 | + j = 0; | |
| 174 | 174 | } else { |
| 175 | - i = 0; | |
| 175 | + i = 0; | |
| 176 | 176 | } |
| 177 | 177 | (void)memcpy(&context->buffer[j], &data[i], len - i); |
| 178 | 178 | } |
| 179 | 179 | |
| 180 | 180 | |
| @@ -184,22 +184,22 @@ | ||
| 184 | 184 | static void SHA1Final(SHA1Context *context, unsigned char digest[20]){ |
| 185 | 185 | unsigned int i; |
| 186 | 186 | unsigned char finalcount[8]; |
| 187 | 187 | |
| 188 | 188 | for (i = 0; i < 8; i++) { |
| 189 | - finalcount[i] = (unsigned char)((context->count[(i >= 4 ? 0 : 1)] | |
| 190 | - >> ((3-(i & 3)) * 8) ) & 255); /* Endian independent */ | |
| 189 | + finalcount[i] = (unsigned char)((context->count[(i >= 4 ? 0 : 1)] | |
| 190 | + >> ((3-(i & 3)) * 8) ) & 255); /* Endian independent */ | |
| 191 | 191 | } |
| 192 | 192 | SHA1Update(context, (const unsigned char *)"\200", 1); |
| 193 | 193 | while ((context->count[0] & 504) != 448) |
| 194 | - SHA1Update(context, (const unsigned char *)"\0", 1); | |
| 194 | + SHA1Update(context, (const unsigned char *)"\0", 1); | |
| 195 | 195 | SHA1Update(context, finalcount, 8); /* Should cause a SHA1Transform() */ |
| 196 | 196 | |
| 197 | 197 | if (digest) { |
| 198 | - for (i = 0; i < 20; i++) | |
| 199 | - digest[i] = (unsigned char) | |
| 200 | - ((context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255); | |
| 198 | + for (i = 0; i < 20; i++) | |
| 199 | + digest[i] = (unsigned char) | |
| 200 | + ((context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255); | |
| 201 | 201 | } |
| 202 | 202 | } |
| 203 | 203 | |
| 204 | 204 | |
| 205 | 205 | /* |
| 206 | 206 |
| --- src/sha1.c | |
| +++ src/sha1.c | |
| @@ -161,20 +161,20 @@ | |
| 161 | ){ |
| 162 | unsigned int i, j; |
| 163 | |
| 164 | j = context->count[0]; |
| 165 | if ((context->count[0] += len << 3) < j) |
| 166 | context->count[1] += (len>>29)+1; |
| 167 | j = (j >> 3) & 63; |
| 168 | if ((j + len) > 63) { |
| 169 | (void)memcpy(&context->buffer[j], data, (i = 64-j)); |
| 170 | SHA1Transform(context->state, context->buffer); |
| 171 | for ( ; i + 63 < len; i += 64) |
| 172 | SHA1Transform(context->state, &data[i]); |
| 173 | j = 0; |
| 174 | } else { |
| 175 | i = 0; |
| 176 | } |
| 177 | (void)memcpy(&context->buffer[j], &data[i], len - i); |
| 178 | } |
| 179 | |
| 180 | |
| @@ -184,22 +184,22 @@ | |
| 184 | static void SHA1Final(SHA1Context *context, unsigned char digest[20]){ |
| 185 | unsigned int i; |
| 186 | unsigned char finalcount[8]; |
| 187 | |
| 188 | for (i = 0; i < 8; i++) { |
| 189 | finalcount[i] = (unsigned char)((context->count[(i >= 4 ? 0 : 1)] |
| 190 | >> ((3-(i & 3)) * 8) ) & 255); /* Endian independent */ |
| 191 | } |
| 192 | SHA1Update(context, (const unsigned char *)"\200", 1); |
| 193 | while ((context->count[0] & 504) != 448) |
| 194 | SHA1Update(context, (const unsigned char *)"\0", 1); |
| 195 | SHA1Update(context, finalcount, 8); /* Should cause a SHA1Transform() */ |
| 196 | |
| 197 | if (digest) { |
| 198 | for (i = 0; i < 20; i++) |
| 199 | digest[i] = (unsigned char) |
| 200 | ((context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255); |
| 201 | } |
| 202 | } |
| 203 | |
| 204 | |
| 205 | /* |
| 206 |
| --- src/sha1.c | |
| +++ src/sha1.c | |
| @@ -161,20 +161,20 @@ | |
| 161 | ){ |
| 162 | unsigned int i, j; |
| 163 | |
| 164 | j = context->count[0]; |
| 165 | if ((context->count[0] += len << 3) < j) |
| 166 | context->count[1] += (len>>29)+1; |
| 167 | j = (j >> 3) & 63; |
| 168 | if ((j + len) > 63) { |
| 169 | (void)memcpy(&context->buffer[j], data, (i = 64-j)); |
| 170 | SHA1Transform(context->state, context->buffer); |
| 171 | for ( ; i + 63 < len; i += 64) |
| 172 | SHA1Transform(context->state, &data[i]); |
| 173 | j = 0; |
| 174 | } else { |
| 175 | i = 0; |
| 176 | } |
| 177 | (void)memcpy(&context->buffer[j], &data[i], len - i); |
| 178 | } |
| 179 | |
| 180 | |
| @@ -184,22 +184,22 @@ | |
| 184 | static void SHA1Final(SHA1Context *context, unsigned char digest[20]){ |
| 185 | unsigned int i; |
| 186 | unsigned char finalcount[8]; |
| 187 | |
| 188 | for (i = 0; i < 8; i++) { |
| 189 | finalcount[i] = (unsigned char)((context->count[(i >= 4 ? 0 : 1)] |
| 190 | >> ((3-(i & 3)) * 8) ) & 255); /* Endian independent */ |
| 191 | } |
| 192 | SHA1Update(context, (const unsigned char *)"\200", 1); |
| 193 | while ((context->count[0] & 504) != 448) |
| 194 | SHA1Update(context, (const unsigned char *)"\0", 1); |
| 195 | SHA1Update(context, finalcount, 8); /* Should cause a SHA1Transform() */ |
| 196 | |
| 197 | if (digest) { |
| 198 | for (i = 0; i < 20; i++) |
| 199 | digest[i] = (unsigned char) |
| 200 | ((context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255); |
| 201 | } |
| 202 | } |
| 203 | |
| 204 | |
| 205 | /* |
| 206 |
+6
-6
| --- src/style.c | ||
| +++ src/style.c | ||
| @@ -1114,18 +1114,18 @@ | ||
| 1114 | 1114 | int i; |
| 1115 | 1115 | |
| 1116 | 1116 | for (i=0;cssDefaultList[i].elementClass;i++){ |
| 1117 | 1117 | if (cssDefaultList[i].elementClass[0]){ |
| 1118 | 1118 | cgi_printf("/* %s */\n%s {\n%s\n}\n\n", |
| 1119 | - cssDefaultList[i].comment, | |
| 1120 | - cssDefaultList[i].elementClass, | |
| 1121 | - cssDefaultList[i].value | |
| 1122 | - ); | |
| 1119 | + cssDefaultList[i].comment, | |
| 1120 | + cssDefaultList[i].elementClass, | |
| 1121 | + cssDefaultList[i].value | |
| 1122 | + ); | |
| 1123 | 1123 | }else{ |
| 1124 | 1124 | cgi_printf("%s", |
| 1125 | - cssDefaultList[i].value | |
| 1126 | - ); | |
| 1125 | + cssDefaultList[i].value | |
| 1126 | + ); | |
| 1127 | 1127 | } |
| 1128 | 1128 | } |
| 1129 | 1129 | } |
| 1130 | 1130 | |
| 1131 | 1131 | /* |
| 1132 | 1132 |
| --- src/style.c | |
| +++ src/style.c | |
| @@ -1114,18 +1114,18 @@ | |
| 1114 | int i; |
| 1115 | |
| 1116 | for (i=0;cssDefaultList[i].elementClass;i++){ |
| 1117 | if (cssDefaultList[i].elementClass[0]){ |
| 1118 | cgi_printf("/* %s */\n%s {\n%s\n}\n\n", |
| 1119 | cssDefaultList[i].comment, |
| 1120 | cssDefaultList[i].elementClass, |
| 1121 | cssDefaultList[i].value |
| 1122 | ); |
| 1123 | }else{ |
| 1124 | cgi_printf("%s", |
| 1125 | cssDefaultList[i].value |
| 1126 | ); |
| 1127 | } |
| 1128 | } |
| 1129 | } |
| 1130 | |
| 1131 | /* |
| 1132 |
| --- src/style.c | |
| +++ src/style.c | |
| @@ -1114,18 +1114,18 @@ | |
| 1114 | int i; |
| 1115 | |
| 1116 | for (i=0;cssDefaultList[i].elementClass;i++){ |
| 1117 | if (cssDefaultList[i].elementClass[0]){ |
| 1118 | cgi_printf("/* %s */\n%s {\n%s\n}\n\n", |
| 1119 | cssDefaultList[i].comment, |
| 1120 | cssDefaultList[i].elementClass, |
| 1121 | cssDefaultList[i].value |
| 1122 | ); |
| 1123 | }else{ |
| 1124 | cgi_printf("%s", |
| 1125 | cssDefaultList[i].value |
| 1126 | ); |
| 1127 | } |
| 1128 | } |
| 1129 | } |
| 1130 | |
| 1131 | /* |
| 1132 |
+6
-6
| --- src/tkt.c | ||
| +++ src/tkt.c | ||
| @@ -1257,16 +1257,16 @@ | ||
| 1257 | 1257 | const char *z; |
| 1258 | 1258 | z = pTicket->aField[i].zName; |
| 1259 | 1259 | blob_set(&val, pTicket->aField[i].zValue); |
| 1260 | 1260 | if( z[0]=='+' ){ |
| 1261 | 1261 | fossil_print(" Append to "); |
| 1262 | - z++; | |
| 1263 | - }else{ | |
| 1264 | - fossil_print(" Change "); | |
| 1265 | - } | |
| 1266 | - fossil_print("%h: ",z); | |
| 1267 | - if( blob_size(&val)>50 || contains_newline(&val)) { | |
| 1262 | + z++; | |
| 1263 | + }else{ | |
| 1264 | + fossil_print(" Change "); | |
| 1265 | + } | |
| 1266 | + fossil_print("%h: ",z); | |
| 1267 | + if( blob_size(&val)>50 || contains_newline(&val)) { | |
| 1268 | 1268 | fossil_print("\n ",blob_str(&val)); |
| 1269 | 1269 | comment_print(blob_str(&val),4,79); |
| 1270 | 1270 | }else{ |
| 1271 | 1271 | fossil_print("%s\n",blob_str(&val)); |
| 1272 | 1272 | } |
| 1273 | 1273 |
| --- src/tkt.c | |
| +++ src/tkt.c | |
| @@ -1257,16 +1257,16 @@ | |
| 1257 | const char *z; |
| 1258 | z = pTicket->aField[i].zName; |
| 1259 | blob_set(&val, pTicket->aField[i].zValue); |
| 1260 | if( z[0]=='+' ){ |
| 1261 | fossil_print(" Append to "); |
| 1262 | z++; |
| 1263 | }else{ |
| 1264 | fossil_print(" Change "); |
| 1265 | } |
| 1266 | fossil_print("%h: ",z); |
| 1267 | if( blob_size(&val)>50 || contains_newline(&val)) { |
| 1268 | fossil_print("\n ",blob_str(&val)); |
| 1269 | comment_print(blob_str(&val),4,79); |
| 1270 | }else{ |
| 1271 | fossil_print("%s\n",blob_str(&val)); |
| 1272 | } |
| 1273 |
| --- src/tkt.c | |
| +++ src/tkt.c | |
| @@ -1257,16 +1257,16 @@ | |
| 1257 | const char *z; |
| 1258 | z = pTicket->aField[i].zName; |
| 1259 | blob_set(&val, pTicket->aField[i].zValue); |
| 1260 | if( z[0]=='+' ){ |
| 1261 | fossil_print(" Append to "); |
| 1262 | z++; |
| 1263 | }else{ |
| 1264 | fossil_print(" Change "); |
| 1265 | } |
| 1266 | fossil_print("%h: ",z); |
| 1267 | if( blob_size(&val)>50 || contains_newline(&val)) { |
| 1268 | fossil_print("\n ",blob_str(&val)); |
| 1269 | comment_print(blob_str(&val),4,79); |
| 1270 | }else{ |
| 1271 | fossil_print("%s\n",blob_str(&val)); |
| 1272 | } |
| 1273 |
+1
-1
| --- src/wiki.c | ||
| +++ src/wiki.c | ||
| @@ -869,11 +869,11 @@ | ||
| 869 | 869 | style_header("Wiki Pages Found"); |
| 870 | 870 | @ <ul> |
| 871 | 871 | db_prepare(&q, |
| 872 | 872 | "SELECT substr(tagname, 6, 1000) FROM tag WHERE tagname like 'wiki-%%%q%%'" |
| 873 | 873 | " ORDER BY lower(tagname) /*sort*/" , |
| 874 | - zTitle); | |
| 874 | + zTitle); | |
| 875 | 875 | while( db_step(&q)==SQLITE_ROW ){ |
| 876 | 876 | const char *zName = db_column_text(&q, 0); |
| 877 | 877 | @ <li>%z(href("%R/wiki?name=%T",zName))%h(zName)</a></li> |
| 878 | 878 | } |
| 879 | 879 | db_finalize(&q); |
| 880 | 880 |
| --- src/wiki.c | |
| +++ src/wiki.c | |
| @@ -869,11 +869,11 @@ | |
| 869 | style_header("Wiki Pages Found"); |
| 870 | @ <ul> |
| 871 | db_prepare(&q, |
| 872 | "SELECT substr(tagname, 6, 1000) FROM tag WHERE tagname like 'wiki-%%%q%%'" |
| 873 | " ORDER BY lower(tagname) /*sort*/" , |
| 874 | zTitle); |
| 875 | while( db_step(&q)==SQLITE_ROW ){ |
| 876 | const char *zName = db_column_text(&q, 0); |
| 877 | @ <li>%z(href("%R/wiki?name=%T",zName))%h(zName)</a></li> |
| 878 | } |
| 879 | db_finalize(&q); |
| 880 |
| --- src/wiki.c | |
| +++ src/wiki.c | |
| @@ -869,11 +869,11 @@ | |
| 869 | style_header("Wiki Pages Found"); |
| 870 | @ <ul> |
| 871 | db_prepare(&q, |
| 872 | "SELECT substr(tagname, 6, 1000) FROM tag WHERE tagname like 'wiki-%%%q%%'" |
| 873 | " ORDER BY lower(tagname) /*sort*/" , |
| 874 | zTitle); |
| 875 | while( db_step(&q)==SQLITE_ROW ){ |
| 876 | const char *zName = db_column_text(&q, 0); |
| 877 | @ <li>%z(href("%R/wiki?name=%T",zName))%h(zName)</a></li> |
| 878 | } |
| 879 | db_finalize(&q); |
| 880 |