]> git.michaelhowe.org Git - packages/o/openafs.git/commitdiff
vol: remove potential data loss warnings in vol-salvage.c
authorJeffrey Altman <jaltman@your-file-system.com>
Thu, 20 Jan 2011 07:03:56 +0000 (02:03 -0500)
committerDerrick Brashear <shadow@dementia.org>
Sat, 22 Jan 2011 20:43:51 +0000 (12:43 -0800)
afs_sfsize_t is not always the same size as 'int'.
Avoid warnings by using afs_sfsize_t in the appropriate locations.

Change-Id: I88f7458421c3a9c2081597e5481d352bd5a2927a
Reviewed-on: http://gerrit.openafs.org/3706
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Rod Widdowson <rdw@steadingsoftware.com>
src/vol/vol-salvage.c

index c694db2eb02261052e9075d50dab9c4388720d38..1884ebe2c31d3a0887c7894bd32cc5694d0a4a98 100644 (file)
@@ -3092,7 +3092,7 @@ JudgeEntry(void *arock, char *name, afs_int32 vnodeNumber,
            Log("FOUND suid/sgid file: %s" OS_DIRSEP "%s (%u.%u %05o) author %u (vnode %u dir %u)\n", dir->name ? dir->name : "??", name, vnodeEssence->owner, vnodeEssence->group, vnodeEssence->modeBits, vnodeEssence->author, vnodeNumber, dir->vnodeNumber);
        if (/* ShowMounts && */ (vnodeEssence->type == vSymlink)
            && !(vnodeEssence->modeBits & 0111)) {
-           ssize_t nBytes;
+           afs_sfsize_t nBytes;
            afs_sfsize_t size;
            char buf[1025];
            IHandle_t *ihP;
@@ -3980,7 +3980,7 @@ SalvageVolume(struct SalvInfo *salvinfo, struct InodeSummary *rwIsp, IHandle_t *
      * will get removed here also (if requested).
      */
     for (class = 0; class < nVNODECLASSES; class++) {
-       int nVnodes = salvinfo->vnodeInfo[class].nVnodes;
+       afs_sfsize_t nVnodes = salvinfo->vnodeInfo[class].nVnodes;
        struct VnodeClassInfo *vcp = &VnodeClassInfo[class];
        struct VnodeEssence *vnodes = salvinfo->vnodeInfo[class].vnodes;
        FilesInVolume += salvinfo->vnodeInfo[class].nAllocatedVnodes;