Fossil SCM

Change return type of db_last_insert_rowid() to size_t.

jan.nijtmans 2013-06-20 13:56 UTC trunk
Commit e1cb483a9b582c9b5be609a8db80262414fbd817
Parent 928b26ab6af2b14…
10 files changed +4 -4 +2 -2 +1 -1 +2 -2 +1 -1 +1 -1 +1 -1 +1 -1 +1 -1 +1 -1
~ src/content.c ~ src/db.c ~ src/import.c ~ src/json.c ~ src/main.c ~ src/manifest.c ~ src/merge.c ~ src/report.c ~ src/tag.c ~ src/tkt.c
M src/content.c
+4 -4
--- src/content.c
+++ src/content.c
@@ -547,11 +547,11 @@
547547
 }
548548
 if( rid>0 ){
549549
 /* We are just adding data to a phantom */
550550
 db_prepare(&s1,
551551
 "UPDATE blob SET rcvid=%d, size=%d, content=:data WHERE rid=%d",
552
- g.rcvid, size, rid
552
+ (int) g.rcvid, size, rid
553553
 );
554554
 db_bind_blob(&s1, ":data", &cmpr);
555555
 db_exec(&s1);
556556
 db_multi_exec("DELETE FROM phantom WHERE rid=%d", rid);
557557
 if( srcId==0 || content_is_available(srcId) ){
@@ -561,15 +561,15 @@
561561
 }else{
562562
 /* We are creating a new entry */
563563
 db_prepare(&s1,
564564
 "INSERT INTO blob(rcvid,size,uuid,content)"
565565
 "VALUES(%d,%d,'%b',:data)",
566
- g.rcvid, size, &hash
566
+ (int) g.rcvid, size, &hash
567567
 );
568568
 db_bind_blob(&s1, ":data", &cmpr);
569569
 db_exec(&s1);
570
- rid = db_last_insert_rowid();
570
+ rid = (int) db_last_insert_rowid();
571571
 if( !pBlob ){
572572
 db_multi_exec("INSERT OR IGNORE INTO phantom VALUES(%d)", rid);
573573
 }
574574
 if( g.markPrivate || isPrivate ){
575575
 db_multi_exec("INSERT INTO private VALUES(%d)", rid);
@@ -643,11 +643,11 @@
643643
 "INSERT INTO blob(rcvid,size,uuid,content)"
644644
 "VALUES(0,-1,:uuid,NULL)"
645645
 );
646646
 db_bind_text(&s1, ":uuid", zUuid);
647647
 db_exec(&s1);
648
- rid = db_last_insert_rowid();
648
+ rid = (int) db_last_insert_rowid();
649649
 db_static_prepare(&s2,
650650
 "INSERT INTO phantom VALUES(:rid)"
651651
 );
652652
 db_bind_int(&s2, ":rid", rid);
653653
 db_exec(&s2);
654654
--- src/content.c
+++ src/content.c
@@ -547,11 +547,11 @@
547 }
548 if( rid>0 ){
549 /* We are just adding data to a phantom */
550 db_prepare(&s1,
551 "UPDATE blob SET rcvid=%d, size=%d, content=:data WHERE rid=%d",
552 g.rcvid, size, rid
553 );
554 db_bind_blob(&s1, ":data", &cmpr);
555 db_exec(&s1);
556 db_multi_exec("DELETE FROM phantom WHERE rid=%d", rid);
557 if( srcId==0 || content_is_available(srcId) ){
@@ -561,15 +561,15 @@
561 }else{
562 /* We are creating a new entry */
563 db_prepare(&s1,
564 "INSERT INTO blob(rcvid,size,uuid,content)"
565 "VALUES(%d,%d,'%b',:data)",
566 g.rcvid, size, &hash
567 );
568 db_bind_blob(&s1, ":data", &cmpr);
569 db_exec(&s1);
570 rid = db_last_insert_rowid();
571 if( !pBlob ){
572 db_multi_exec("INSERT OR IGNORE INTO phantom VALUES(%d)", rid);
573 }
574 if( g.markPrivate || isPrivate ){
575 db_multi_exec("INSERT INTO private VALUES(%d)", rid);
@@ -643,11 +643,11 @@
643 "INSERT INTO blob(rcvid,size,uuid,content)"
644 "VALUES(0,-1,:uuid,NULL)"
645 );
646 db_bind_text(&s1, ":uuid", zUuid);
647 db_exec(&s1);
648 rid = db_last_insert_rowid();
649 db_static_prepare(&s2,
650 "INSERT INTO phantom VALUES(:rid)"
651 );
652 db_bind_int(&s2, ":rid", rid);
653 db_exec(&s2);
654
--- src/content.c
+++ src/content.c
@@ -547,11 +547,11 @@
547 }
548 if( rid>0 ){
549 /* We are just adding data to a phantom */
550 db_prepare(&s1,
551 "UPDATE blob SET rcvid=%d, size=%d, content=:data WHERE rid=%d",
552 (int) g.rcvid, size, rid
553 );
554 db_bind_blob(&s1, ":data", &cmpr);
555 db_exec(&s1);
556 db_multi_exec("DELETE FROM phantom WHERE rid=%d", rid);
557 if( srcId==0 || content_is_available(srcId) ){
@@ -561,15 +561,15 @@
561 }else{
562 /* We are creating a new entry */
563 db_prepare(&s1,
564 "INSERT INTO blob(rcvid,size,uuid,content)"
565 "VALUES(%d,%d,'%b',:data)",
566 (int) g.rcvid, size, &hash
567 );
568 db_bind_blob(&s1, ":data", &cmpr);
569 db_exec(&s1);
570 rid = (int) db_last_insert_rowid();
571 if( !pBlob ){
572 db_multi_exec("INSERT OR IGNORE INTO phantom VALUES(%d)", rid);
573 }
574 if( g.markPrivate || isPrivate ){
575 db_multi_exec("INSERT INTO private VALUES(%d)", rid);
@@ -643,11 +643,11 @@
643 "INSERT INTO blob(rcvid,size,uuid,content)"
644 "VALUES(0,-1,:uuid,NULL)"
645 );
646 db_bind_text(&s1, ":uuid", zUuid);
647 db_exec(&s1);
648 rid = (int) db_last_insert_rowid();
649 db_static_prepare(&s2,
650 "INSERT INTO phantom VALUES(:rid)"
651 );
652 db_bind_int(&s2, ":rid", rid);
653 db_exec(&s2);
654
M src/db.c
+2 -2
--- src/db.c
+++ src/db.c
@@ -399,12 +399,12 @@
399399
 }
400400
401401
 /*
402402
 ** Return the rowid of the most recent insert
403403
 */
404
-i64 db_last_insert_rowid(void){
405
- return sqlite3_last_insert_rowid(g.db);
404
+size_t db_last_insert_rowid(void){
405
+ return (size_t) sqlite3_last_insert_rowid(g.db);
406406
 }
407407
408408
 /*
409409
 ** Return the number of rows that were changed by the most recent
410410
 ** INSERT, UPDATE, or DELETE. Auxiliary changes caused by triggers
411411
--- src/db.c
+++ src/db.c
@@ -399,12 +399,12 @@
399 }
400
401 /*
402 ** Return the rowid of the most recent insert
403 */
404 i64 db_last_insert_rowid(void){
405 return sqlite3_last_insert_rowid(g.db);
406 }
407
408 /*
409 ** Return the number of rows that were changed by the most recent
410 ** INSERT, UPDATE, or DELETE. Auxiliary changes caused by triggers
411
--- src/db.c
+++ src/db.c
@@ -399,12 +399,12 @@
399 }
400
401 /*
402 ** Return the rowid of the most recent insert
403 */
404 size_t db_last_insert_rowid(void){
405 return (size_t) sqlite3_last_insert_rowid(g.db);
406 }
407
408 /*
409 ** Return the number of rows that were changed by the most recent
410 ** INSERT, UPDATE, or DELETE. Auxiliary changes caused by triggers
411
M src/import.c
+1 -1
--- src/import.c
+++ src/import.c
@@ -147,11 +147,11 @@
147147
 blob_compress(pContent, &cmpr);
148148
 db_bind_blob(&ins, ":content", &cmpr);
149149
 db_step(&ins);
150150
 db_reset(&ins);
151151
 blob_reset(&cmpr);
152
- rid = db_last_insert_rowid();
152
+ rid = (int) db_last_insert_rowid();
153153
 }
154154
 if( zMark ){
155155
 db_multi_exec(
156156
 "INSERT OR IGNORE INTO xmark(tname, trid, tuuid)"
157157
 "VALUES(%Q,%d,%B)",
158158
--- src/import.c
+++ src/import.c
@@ -147,11 +147,11 @@
147 blob_compress(pContent, &cmpr);
148 db_bind_blob(&ins, ":content", &cmpr);
149 db_step(&ins);
150 db_reset(&ins);
151 blob_reset(&cmpr);
152 rid = db_last_insert_rowid();
153 }
154 if( zMark ){
155 db_multi_exec(
156 "INSERT OR IGNORE INTO xmark(tname, trid, tuuid)"
157 "VALUES(%Q,%d,%B)",
158
--- src/import.c
+++ src/import.c
@@ -147,11 +147,11 @@
147 blob_compress(pContent, &cmpr);
148 db_bind_blob(&ins, ":content", &cmpr);
149 db_step(&ins);
150 db_reset(&ins);
151 blob_reset(&cmpr);
152 rid = (int) db_last_insert_rowid();
153 }
154 if( zMark ){
155 db_multi_exec(
156 "INSERT OR IGNORE INTO xmark(tname, trid, tuuid)"
157 "VALUES(%Q,%d,%B)",
158
M src/json.c
+2 -2
--- src/json.c
+++ src/json.c
@@ -267,11 +267,11 @@
267267
 v = cson_value_new_string(zStr, strlen(zStr));
268268
 free(zStr);
269269
 return v;
270270
 }
271271
272
-cson_value * json_new_int( int v ){
272
+cson_value * json_new_int( i64 v ){
273273
 return cson_value_new_integer((cson_int_t)v);
274274
 }
275275
276276
 /*
277277
 ** Gets a POST/POST.payload/GET/COOKIE/ENV value. The returned memory
@@ -1247,11 +1247,11 @@
12471247
 cson_value * json_g_to_json(){
12481248
 cson_object * o = NULL;
12491249
 cson_object * pay = NULL;
12501250
 pay = o = cson_new_object();
12511251
1252
-#define INT(OBJ,K) cson_object_set(o, #K, json_new_int(OBJ.K))
1252
+#define INT(OBJ,K) cson_object_set(o, #K, json_new_int((i64)OBJ.K))
12531253
 #define CSTR(OBJ,K) cson_object_set(o, #K, OBJ.K ? json_new_string(OBJ.K) : cson_value_null())
12541254
 #define VAL(K,V) cson_object_set(o, #K, (V) ? (V) : cson_value_null())
12551255
 VAL(capabilities, json_cap_value());
12561256
 INT(g, argc);
12571257
 INT(g, isConst);
12581258
--- src/json.c
+++ src/json.c
@@ -267,11 +267,11 @@
267 v = cson_value_new_string(zStr, strlen(zStr));
268 free(zStr);
269 return v;
270 }
271
272 cson_value * json_new_int( int v ){
273 return cson_value_new_integer((cson_int_t)v);
274 }
275
276 /*
277 ** Gets a POST/POST.payload/GET/COOKIE/ENV value. The returned memory
@@ -1247,11 +1247,11 @@
1247 cson_value * json_g_to_json(){
1248 cson_object * o = NULL;
1249 cson_object * pay = NULL;
1250 pay = o = cson_new_object();
1251
1252 #define INT(OBJ,K) cson_object_set(o, #K, json_new_int(OBJ.K))
1253 #define CSTR(OBJ,K) cson_object_set(o, #K, OBJ.K ? json_new_string(OBJ.K) : cson_value_null())
1254 #define VAL(K,V) cson_object_set(o, #K, (V) ? (V) : cson_value_null())
1255 VAL(capabilities, json_cap_value());
1256 INT(g, argc);
1257 INT(g, isConst);
1258
--- src/json.c
+++ src/json.c
@@ -267,11 +267,11 @@
267 v = cson_value_new_string(zStr, strlen(zStr));
268 free(zStr);
269 return v;
270 }
271
272 cson_value * json_new_int( i64 v ){
273 return cson_value_new_integer((cson_int_t)v);
274 }
275
276 /*
277 ** Gets a POST/POST.payload/GET/COOKIE/ENV value. The returned memory
@@ -1247,11 +1247,11 @@
1247 cson_value * json_g_to_json(){
1248 cson_object * o = NULL;
1249 cson_object * pay = NULL;
1250 pay = o = cson_new_object();
1251
1252 #define INT(OBJ,K) cson_object_set(o, #K, json_new_int((i64)OBJ.K))
1253 #define CSTR(OBJ,K) cson_object_set(o, #K, OBJ.K ? json_new_string(OBJ.K) : cson_value_null())
1254 #define VAL(K,V) cson_object_set(o, #K, (V) ? (V) : cson_value_null())
1255 VAL(capabilities, json_cap_value());
1256 INT(g, argc);
1257 INT(g, isConst);
1258
M src/main.c
+1 -1
--- src/main.c
+++ src/main.c
@@ -185,11 +185,11 @@
185185
 int useLocalauth; /* No login required if from 127.0.0.1 */
186186
 int noPswd; /* Logged in without password (on 127.0.0.1) */
187187
 int userUid; /* Integer user id */
188188
189189
 /* Information used to populate the RCVFROM table */
190
- int rcvid; /* The rcvid. 0 if not yet defined. */
190
+ size_t rcvid; /* The rcvid. 0 if not yet defined. */
191191
 char *zIpAddr; /* The remote IP address */
192192
 char *zNonce; /* The nonce used for login */
193193
194194
 /* permissions used by the server */
195195
 struct FossilUserPerms perm;
196196
--- src/main.c
+++ src/main.c
@@ -185,11 +185,11 @@
185 int useLocalauth; /* No login required if from 127.0.0.1 */
186 int noPswd; /* Logged in without password (on 127.0.0.1) */
187 int userUid; /* Integer user id */
188
189 /* Information used to populate the RCVFROM table */
190 int rcvid; /* The rcvid. 0 if not yet defined. */
191 char *zIpAddr; /* The remote IP address */
192 char *zNonce; /* The nonce used for login */
193
194 /* permissions used by the server */
195 struct FossilUserPerms perm;
196
--- src/main.c
+++ src/main.c
@@ -185,11 +185,11 @@
185 int useLocalauth; /* No login required if from 127.0.0.1 */
186 int noPswd; /* Logged in without password (on 127.0.0.1) */
187 int userUid; /* Integer user id */
188
189 /* Information used to populate the RCVFROM table */
190 size_t rcvid; /* The rcvid. 0 if not yet defined. */
191 char *zIpAddr; /* The remote IP address */
192 char *zNonce; /* The nonce used for login */
193
194 /* permissions used by the server */
195 struct FossilUserPerms perm;
196
M src/manifest.c
+1 -1
--- src/manifest.c
+++ src/manifest.c
@@ -1144,11 +1144,11 @@
11441144
 db_reset(&q1);
11451145
 if( fnid==0 ){
11461146
 db_static_prepare(&s1, "INSERT INTO filename(name) VALUES(:fn)");
11471147
 db_bind_text(&s1, ":fn", zFilename);
11481148
 db_exec(&s1);
1149
- fnid = db_last_insert_rowid();
1149
+ fnid = (int) db_last_insert_rowid();
11501150
 }
11511151
 return fnid;
11521152
 }
11531153
11541154
 /*
11551155
--- src/manifest.c
+++ src/manifest.c
@@ -1144,11 +1144,11 @@
1144 db_reset(&q1);
1145 if( fnid==0 ){
1146 db_static_prepare(&s1, "INSERT INTO filename(name) VALUES(:fn)");
1147 db_bind_text(&s1, ":fn", zFilename);
1148 db_exec(&s1);
1149 fnid = db_last_insert_rowid();
1150 }
1151 return fnid;
1152 }
1153
1154 /*
1155
--- src/manifest.c
+++ src/manifest.c
@@ -1144,11 +1144,11 @@
1144 db_reset(&q1);
1145 if( fnid==0 ){
1146 db_static_prepare(&s1, "INSERT INTO filename(name) VALUES(:fn)");
1147 db_bind_text(&s1, ":fn", zFilename);
1148 db_exec(&s1);
1149 fnid = (int) db_last_insert_rowid();
1150 }
1151 return fnid;
1152 }
1153
1154 /*
1155
M src/merge.c
+1 -1
--- src/merge.c
+++ src/merge.c
@@ -437,11 +437,11 @@
437437
 db_multi_exec(
438438
 "INSERT INTO vfile(vid,chnged,deleted,rid,mrid,isexe,islink,pathname)"
439439
 " SELECT %d,3,0,rid,mrid,isexe,islink,pathname FROM vfile WHERE id=%d",
440440
 vid, idm
441441
 );
442
- idv = db_last_insert_rowid();
442
+ idv = (int) db_last_insert_rowid();
443443
 db_multi_exec("UPDATE fv SET idv=%d WHERE rowid=%d", idv, rowid);
444444
 zName = db_column_text(&q, 2);
445445
 zFullName = mprintf("%s%s", g.zLocalRoot, zName);
446446
 if( file_wd_isfile_or_link(zFullName) ){
447447
 fossil_print("ADDED %s (overwrites an unmanaged file)\n", zName);
448448
--- src/merge.c
+++ src/merge.c
@@ -437,11 +437,11 @@
437 db_multi_exec(
438 "INSERT INTO vfile(vid,chnged,deleted,rid,mrid,isexe,islink,pathname)"
439 " SELECT %d,3,0,rid,mrid,isexe,islink,pathname FROM vfile WHERE id=%d",
440 vid, idm
441 );
442 idv = db_last_insert_rowid();
443 db_multi_exec("UPDATE fv SET idv=%d WHERE rowid=%d", idv, rowid);
444 zName = db_column_text(&q, 2);
445 zFullName = mprintf("%s%s", g.zLocalRoot, zName);
446 if( file_wd_isfile_or_link(zFullName) ){
447 fossil_print("ADDED %s (overwrites an unmanaged file)\n", zName);
448
--- src/merge.c
+++ src/merge.c
@@ -437,11 +437,11 @@
437 db_multi_exec(
438 "INSERT INTO vfile(vid,chnged,deleted,rid,mrid,isexe,islink,pathname)"
439 " SELECT %d,3,0,rid,mrid,isexe,islink,pathname FROM vfile WHERE id=%d",
440 vid, idm
441 );
442 idv = (int) db_last_insert_rowid();
443 db_multi_exec("UPDATE fv SET idv=%d WHERE rowid=%d", idv, rowid);
444 zName = db_column_text(&q, 2);
445 zFullName = mprintf("%s%s", g.zLocalRoot, zName);
446 if( file_wd_isfile_or_link(zFullName) ){
447 fossil_print("ADDED %s (overwrites an unmanaged file)\n", zName);
448
M src/report.c
+1 -1
--- src/report.c
+++ src/report.c
@@ -391,11 +391,11 @@
391391
 zTitle, zSQL, zOwner, zClrKey, rn);
392392
 }else{
393393
 db_multi_exec("INSERT INTO reportfmt(title,sqlcode,owner,cols,mtime) "
394394
 "VALUES(%Q,%Q,%Q,%Q,now())",
395395
 zTitle, zSQL, zOwner, zClrKey);
396
- rn = db_last_insert_rowid();
396
+ rn = (int) db_last_insert_rowid();
397397
 }
398398
 cgi_redirect(mprintf("rptview?rn=%d", rn));
399399
 return;
400400
 }
401401
 }else if( rn==0 ){
402402
--- src/report.c
+++ src/report.c
@@ -391,11 +391,11 @@
391 zTitle, zSQL, zOwner, zClrKey, rn);
392 }else{
393 db_multi_exec("INSERT INTO reportfmt(title,sqlcode,owner,cols,mtime) "
394 "VALUES(%Q,%Q,%Q,%Q,now())",
395 zTitle, zSQL, zOwner, zClrKey);
396 rn = db_last_insert_rowid();
397 }
398 cgi_redirect(mprintf("rptview?rn=%d", rn));
399 return;
400 }
401 }else if( rn==0 ){
402
--- src/report.c
+++ src/report.c
@@ -391,11 +391,11 @@
391 zTitle, zSQL, zOwner, zClrKey, rn);
392 }else{
393 db_multi_exec("INSERT INTO reportfmt(title,sqlcode,owner,cols,mtime) "
394 "VALUES(%Q,%Q,%Q,%Q,now())",
395 zTitle, zSQL, zOwner, zClrKey);
396 rn = (int) db_last_insert_rowid();
397 }
398 cgi_redirect(mprintf("rptview?rn=%d", rn));
399 return;
400 }
401 }else if( rn==0 ){
402
M src/tag.c
+1 -1
--- src/tag.c
+++ src/tag.c
@@ -141,11 +141,11 @@
141141
 int tag_findid(const char *zTag, int createFlag){
142142
 int id;
143143
 id = db_int(0, "SELECT tagid FROM tag WHERE tagname=%Q", zTag);
144144
 if( id==0 && createFlag ){
145145
 db_multi_exec("INSERT INTO tag(tagname) VALUES(%Q)", zTag);
146
- id = db_last_insert_rowid();
146
+ id = (int) db_last_insert_rowid();
147147
 }
148148
 return id;
149149
 }
150150
151151
 /*
152152
--- src/tag.c
+++ src/tag.c
@@ -141,11 +141,11 @@
141 int tag_findid(const char *zTag, int createFlag){
142 int id;
143 id = db_int(0, "SELECT tagid FROM tag WHERE tagname=%Q", zTag);
144 if( id==0 && createFlag ){
145 db_multi_exec("INSERT INTO tag(tagname) VALUES(%Q)", zTag);
146 id = db_last_insert_rowid();
147 }
148 return id;
149 }
150
151 /*
152
--- src/tag.c
+++ src/tag.c
@@ -141,11 +141,11 @@
141 int tag_findid(const char *zTag, int createFlag){
142 int id;
143 id = db_int(0, "SELECT tagid FROM tag WHERE tagname=%Q", zTag);
144 if( id==0 && createFlag ){
145 db_multi_exec("INSERT INTO tag(tagname) VALUES(%Q)", zTag);
146 id = (int) db_last_insert_rowid();
147 }
148 return id;
149 }
150
151 /*
152
M src/tkt.c
+1 -1
--- src/tkt.c
+++ src/tkt.c
@@ -197,11 +197,11 @@
197197
 char *aUsed;
198198
199199
 if( tktid==0 ){
200200
 db_multi_exec("INSERT INTO ticket(tkt_uuid, tkt_mtime) "
201201
 "VALUES(%Q, 0)", p->zTicketUuid);
202
- tktid = db_last_insert_rowid();
202
+ tktid = (int) db_last_insert_rowid();
203203
 }
204204
 blob_zero(&sql1);
205205
 blob_zero(&sql2);
206206
 blob_zero(&sql3);
207207
 blob_appendf(&sql1, "UPDATE OR REPLACE ticket SET tkt_mtime=:mtime");
208208
--- src/tkt.c
+++ src/tkt.c
@@ -197,11 +197,11 @@
197 char *aUsed;
198
199 if( tktid==0 ){
200 db_multi_exec("INSERT INTO ticket(tkt_uuid, tkt_mtime) "
201 "VALUES(%Q, 0)", p->zTicketUuid);
202 tktid = db_last_insert_rowid();
203 }
204 blob_zero(&sql1);
205 blob_zero(&sql2);
206 blob_zero(&sql3);
207 blob_appendf(&sql1, "UPDATE OR REPLACE ticket SET tkt_mtime=:mtime");
208
--- src/tkt.c
+++ src/tkt.c
@@ -197,11 +197,11 @@
197 char *aUsed;
198
199 if( tktid==0 ){
200 db_multi_exec("INSERT INTO ticket(tkt_uuid, tkt_mtime) "
201 "VALUES(%Q, 0)", p->zTicketUuid);
202 tktid = (int) db_last_insert_rowid();
203 }
204 blob_zero(&sql1);
205 blob_zero(&sql2);
206 blob_zero(&sql3);
207 blob_appendf(&sql1, "UPDATE OR REPLACE ticket SET tkt_mtime=:mtime");
208

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button