Differences From Artifact [eece54765e]:

• File src/vfile.c — part of check-in [3e9f9b0609] at 2013-09-02 19:11:14 on branch trunk — Removed some dead SQL code and fixed transaction closing in a "cannot happen" scenario in load_vfile_from_rid(), per ML discussion. (user: stephan size: 24577)

To Artifact [3008a3b8b8]:

• File src/vfile.c — part of check-in [612e0ecc25] at 2013-09-02 19:20:13 on branch trunk — Fixed a wrong-column use in load_vfile_from_rid(), which caused an is-a-phantom check to always eval to false, even for phantoms. This has 'probably' never been triggered before. (user: stephan size: 24577) [more...]

95
96
97
98
99
100
101
102
103
104
105
106
107
108
109

  db_bind_int(&ins, ":vid", vid);
  manifest_file_rewind(p);
  while( (pFile = manifest_file_next(p,0))!=0 ){
    if( pFile->zUuid==0 || uuid_is_shunned(pFile->zUuid) ) continue;
    db_bind_text(&ridq, ":uuid", pFile->zUuid);
    if( db_step(&ridq)==SQLITE_ROW ){
      rid = db_column_int(&ridq, 0);
      size = db_column_int(&ridq, 0);
    }else{
      rid = 0;
      size = 0;
    }
    db_reset(&ridq);
    if( rid==0 || size<0 ){
      fossil_warning("content missing for %s", pFile->zName);

|

95
96
97
98
99
100
101
102
103
104
105
106
107
108
109

  db_bind_int(&ins, ":vid", vid);
  manifest_file_rewind(p);
  while( (pFile = manifest_file_next(p,0))!=0 ){
    if( pFile->zUuid==0 || uuid_is_shunned(pFile->zUuid) ) continue;
    db_bind_text(&ridq, ":uuid", pFile->zUuid);
    if( db_step(&ridq)==SQLITE_ROW ){
      rid = db_column_int(&ridq, 0);
      size = db_column_int(&ridq, 1);
    }else{
      rid = 0;
      size = 0;
    }
    db_reset(&ridq);
    if( rid==0 || size<0 ){
      fossil_warning("content missing for %s", pFile->zName);