revert-large-file-support-20030328

[openafs.git] / src / volser / restorevol.c

diff --git a/src/volser/restorevol.c b/src/volser/restorevol.c
index fcb8326..b928144 100644 (file)
--- a/src/volser/restorevol.c
+++ b/src/volser/restorevol.c
@@ -122,7 +122,7 @@ char buf[BUFSIZE];
 
 char readdata(buffer, size)
   char  *buffer;
-  afs_size_t size;
+  afs_int32 size;
 {
   int   code;
   afs_int32 s;
@@ -384,7 +384,7 @@ struct vNode
     } entries[100];
   } acl;
 #endif
-  afs_size_t dataSize;
+  afs_int32 dataSize;
 };
 
 #define MAXNAMELEN 256
@@ -456,24 +456,12 @@ afs_int32 ReadVNode(count)
              break;
 
           case 'A':
-             readdata(vn.acl, (afs_size_t) 192);  /* Skip ACL data */
+             readdata(vn.acl, 192);             /* Skip ACL data */
              break;
 
-#ifdef AFS_LARGEFILE_ENV
-          case 'h':
-         {
-             afs_uint32 hi, lo;
-             hi = ntohl(readvalue(4));
-             lo = ntohl(readvalue(4));
-             FillInt64(vn.dataSize, hi, lo);
-         }
-         goto common_vnode;
-#endif /* AFS_LARGEFILE_ENV */
-
           case 'f':
-             vn.dataSize = (afs_size_t) ntohl(readvalue(4));
+             vn.dataSize = ntohl(readvalue(4));
 
-      common_vnode:
              /* parentdir is the name of this dir's vnode-file-link
               * or this file's parent vnode-file-link.
               * "./AFSDir-<#>". It's a symbolic link to its real dir.
@@ -649,8 +637,7 @@ afs_int32 ReadVNode(count)
                   */
                  int fid;
                  int lfile;
-                 afs_size_t size;
-                 afs_int32 s;
+                 afs_int32 size, s;
 
                  /* Check if its vnode-file-link exists. If not,
                   * then the file will be an orphaned file.
@@ -674,7 +661,7 @@ afs_int32 ReadVNode(count)
                  fid = open(filename, (O_CREAT | O_WRONLY | O_TRUNC), mode);
                  size = vn.dataSize;
                  while (size > 0) {
-                    s = (afs_int32) ((size > BUFSIZE) ? BUFSIZE : size);
+                    s = ((size > BUFSIZE) ? BUFSIZE : size);
                     code = fread(buf, 1, s, dumpfile);
                     if (code > 0) {
                        write(fid, buf, code);
@@ -684,16 +671,8 @@ afs_int32 ReadVNode(count)
                        if (code < 0)
                           fprintf (stderr, "Code = %d; Errno = %d\n", code, errno);
                        else 
-#ifdef AFS_LARGEFILE_ENV
-                          fprintf (stderr, "Read (0X%x,0X%x) bytes out of (0X%x,0X%x)\n", 
-                                   (unsigned) ((vn.dataSize - size) >> 32),
-                                   (unsigned) ((vn.dataSize - size) & 0xffffffff),
-                                   (unsigned) (vn.dataSize >> 32),
-                                   (unsigned) (vn.dataSize & 0xffffffff));
-#else /* !AFS_LARGEFILE_ENV */
                           fprintf (stderr, "Read %d bytes out of %d\n", 
                                    (vn.dataSize - size), vn.dataSize);
-#endif /* !AFS_LARGEFILE_ENV */
                        break;
                     }
                  }