Fossil

Check-in [3f06618c]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix harmless compiler warnings.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:3f06618c9602871af84c7ecb9749c4047d85cdae
User & Date: mistachkin 2016-10-04 19:06:51
Context
2016-10-04
20:25
Fix typos in the sync document. Make "uv" an alias for "unversioned". Prohibit unversioned filename that contain whitespace since the sync protocol cannot currently handle such files. check-in: 85f957c3 user: drh tags: trunk
19:07
Merge updates from trunk. check-in: 04a8ee6e user: mistachkin tags: seeEnhanced
19:06
Fix harmless compiler warnings. check-in: 3f06618c user: mistachkin tags: trunk
14:55
Update the built-in SQLite 3.15.0 beta. check-in: 3d8a41f1 user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/tar.c.

473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
  Glob *pExclude       /* Exclude files matching this pattern */
){
  Blob mfile, hash, file;
  Manifest *pManifest;
  ManifestFile *pFile;
  Blob filename;
  int nPrefix;
  char *zName;
  unsigned int mTime;

  content_get(rid, &mfile);
  if( blob_size(&mfile)==0 ){
    blob_zero(pTar);
    return;
  }







|







473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
  Glob *pExclude       /* Exclude files matching this pattern */
){
  Blob mfile, hash, file;
  Manifest *pManifest;
  ManifestFile *pFile;
  Blob filename;
  int nPrefix;
  char *zName = 0;
  unsigned int mTime;

  content_get(rid, &mfile);
  if( blob_size(&mfile)==0 ){
    blob_zero(pTar);
    return;
  }

Changes to src/zip.c.

349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
    blob_appendf(&filename, "%s/", zDir);
  }
  nPrefix = blob_size(&filename);

  pManifest = manifest_get(rid, CFTYPE_MANIFEST, 0);
  if( pManifest ){
    int flg, eflg = 0;
    char *zName;
    zip_set_timedate(pManifest->rDate);
    flg = db_get_manifest_setting();
    if( flg ){
      /* eflg is the effective flags, taking include/exclude into account */
      if( (pInclude==0 || glob_match(pInclude, "manifest"))
       && !glob_match(pExclude, "manifest")
       && (flg & MFESTFLG_RAW) ){







|







349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
    blob_appendf(&filename, "%s/", zDir);
  }
  nPrefix = blob_size(&filename);

  pManifest = manifest_get(rid, CFTYPE_MANIFEST, 0);
  if( pManifest ){
    int flg, eflg = 0;
    char *zName = 0;
    zip_set_timedate(pManifest->rDate);
    flg = db_get_manifest_setting();
    if( flg ){
      /* eflg is the effective flags, taking include/exclude into account */
      if( (pInclude==0 || glob_match(pInclude, "manifest"))
       && !glob_match(pExclude, "manifest")
       && (flg & MFESTFLG_RAW) ){