Index: src/content.c ================================================================== --- src/content.c +++ src/content.c @@ -547,11 +547,11 @@ } if( rid>0 ){ /* We are just adding data to a phantom */ db_prepare(&s1, "UPDATE blob SET rcvid=%d, size=%d, content=:data WHERE rid=%d", - g.rcvid, size, rid + (int) g.rcvid, size, rid ); db_bind_blob(&s1, ":data", &cmpr); db_exec(&s1); db_multi_exec("DELETE FROM phantom WHERE rid=%d", rid); if( srcId==0 || content_is_available(srcId) ){ @@ -561,15 +561,15 @@ }else{ /* We are creating a new entry */ db_prepare(&s1, "INSERT INTO blob(rcvid,size,uuid,content)" "VALUES(%d,%d,'%b',:data)", - g.rcvid, size, &hash + (int) g.rcvid, size, &hash ); db_bind_blob(&s1, ":data", &cmpr); db_exec(&s1); - rid = db_last_insert_rowid(); + rid = (int) db_last_insert_rowid(); if( !pBlob ){ db_multi_exec("INSERT OR IGNORE INTO phantom VALUES(%d)", rid); } if( g.markPrivate || isPrivate ){ db_multi_exec("INSERT INTO private VALUES(%d)", rid); @@ -643,11 +643,11 @@ "INSERT INTO blob(rcvid,size,uuid,content)" "VALUES(0,-1,:uuid,NULL)" ); db_bind_text(&s1, ":uuid", zUuid); db_exec(&s1); - rid = db_last_insert_rowid(); + rid = (int) db_last_insert_rowid(); db_static_prepare(&s2, "INSERT INTO phantom VALUES(:rid)" ); db_bind_int(&s2, ":rid", rid); db_exec(&s2); Index: src/db.c ================================================================== --- src/db.c +++ src/db.c @@ -399,12 +399,12 @@ } /* ** Return the rowid of the most recent insert */ -i64 db_last_insert_rowid(void){ - return sqlite3_last_insert_rowid(g.db); +size_t db_last_insert_rowid(void){ + return (size_t) sqlite3_last_insert_rowid(g.db); } /* ** Return the number of rows that were changed by the most recent ** INSERT, UPDATE, or DELETE. Auxiliary changes caused by triggers Index: src/import.c ================================================================== --- src/import.c +++ src/import.c @@ -147,11 +147,11 @@ blob_compress(pContent, &cmpr); db_bind_blob(&ins, ":content", &cmpr); db_step(&ins); db_reset(&ins); blob_reset(&cmpr); - rid = db_last_insert_rowid(); + rid = (int) db_last_insert_rowid(); } if( zMark ){ db_multi_exec( "INSERT OR IGNORE INTO xmark(tname, trid, tuuid)" "VALUES(%Q,%d,%B)", Index: src/json.c ================================================================== --- src/json.c +++ src/json.c @@ -267,11 +267,11 @@ v = cson_value_new_string(zStr, strlen(zStr)); free(zStr); return v; } -cson_value * json_new_int( int v ){ +cson_value * json_new_int( i64 v ){ return cson_value_new_integer((cson_int_t)v); } /* ** Gets a POST/POST.payload/GET/COOKIE/ENV value. The returned memory @@ -1247,11 +1247,11 @@ cson_value * json_g_to_json(){ cson_object * o = NULL; cson_object * pay = NULL; pay = o = cson_new_object(); -#define INT(OBJ,K) cson_object_set(o, #K, json_new_int(OBJ.K)) +#define INT(OBJ,K) cson_object_set(o, #K, json_new_int((i64)OBJ.K)) #define CSTR(OBJ,K) cson_object_set(o, #K, OBJ.K ? json_new_string(OBJ.K) : cson_value_null()) #define VAL(K,V) cson_object_set(o, #K, (V) ? (V) : cson_value_null()) VAL(capabilities, json_cap_value()); INT(g, argc); INT(g, isConst); Index: src/main.c ================================================================== --- src/main.c +++ src/main.c @@ -185,11 +185,11 @@ int useLocalauth; /* No login required if from 127.0.0.1 */ int noPswd; /* Logged in without password (on 127.0.0.1) */ int userUid; /* Integer user id */ /* Information used to populate the RCVFROM table */ - int rcvid; /* The rcvid. 0 if not yet defined. */ + size_t rcvid; /* The rcvid. 0 if not yet defined. */ char *zIpAddr; /* The remote IP address */ char *zNonce; /* The nonce used for login */ /* permissions used by the server */ struct FossilUserPerms perm; Index: src/manifest.c ================================================================== --- src/manifest.c +++ src/manifest.c @@ -1144,11 +1144,11 @@ db_reset(&q1); if( fnid==0 ){ db_static_prepare(&s1, "INSERT INTO filename(name) VALUES(:fn)"); db_bind_text(&s1, ":fn", zFilename); db_exec(&s1); - fnid = db_last_insert_rowid(); + fnid = (int) db_last_insert_rowid(); } return fnid; } /* Index: src/merge.c ================================================================== --- src/merge.c +++ src/merge.c @@ -437,11 +437,11 @@ db_multi_exec( "INSERT INTO vfile(vid,chnged,deleted,rid,mrid,isexe,islink,pathname)" " SELECT %d,3,0,rid,mrid,isexe,islink,pathname FROM vfile WHERE id=%d", vid, idm ); - idv = db_last_insert_rowid(); + idv = (int) db_last_insert_rowid(); db_multi_exec("UPDATE fv SET idv=%d WHERE rowid=%d", idv, rowid); zName = db_column_text(&q, 2); zFullName = mprintf("%s%s", g.zLocalRoot, zName); if( file_wd_isfile_or_link(zFullName) ){ fossil_print("ADDED %s (overwrites an unmanaged file)\n", zName); Index: src/report.c ================================================================== --- src/report.c +++ src/report.c @@ -391,11 +391,11 @@ zTitle, zSQL, zOwner, zClrKey, rn); }else{ db_multi_exec("INSERT INTO reportfmt(title,sqlcode,owner,cols,mtime) " "VALUES(%Q,%Q,%Q,%Q,now())", zTitle, zSQL, zOwner, zClrKey); - rn = db_last_insert_rowid(); + rn = (int) db_last_insert_rowid(); } cgi_redirect(mprintf("rptview?rn=%d", rn)); return; } }else if( rn==0 ){ Index: src/tag.c ================================================================== --- src/tag.c +++ src/tag.c @@ -141,11 +141,11 @@ int tag_findid(const char *zTag, int createFlag){ int id; id = db_int(0, "SELECT tagid FROM tag WHERE tagname=%Q", zTag); if( id==0 && createFlag ){ db_multi_exec("INSERT INTO tag(tagname) VALUES(%Q)", zTag); - id = db_last_insert_rowid(); + id = (int) db_last_insert_rowid(); } return id; } /* Index: src/tkt.c ================================================================== --- src/tkt.c +++ src/tkt.c @@ -197,11 +197,11 @@ char *aUsed; if( tktid==0 ){ db_multi_exec("INSERT INTO ticket(tkt_uuid, tkt_mtime) " "VALUES(%Q, 0)", p->zTicketUuid); - tktid = db_last_insert_rowid(); + tktid = (int) db_last_insert_rowid(); } blob_zero(&sql1); blob_zero(&sql2); blob_zero(&sql3); blob_appendf(&sql1, "UPDATE OR REPLACE ticket SET tkt_mtime=:mtime");