[GNUnet-SVN] r2652 - in GNUnet/src: applications/fs/ecrs applications/fs/fsui applications/fs/module applications/fs/tools util

[grothoff]

Author: grothoff
Date: 2006-04-23 16:03:44 -0700 (Sun, 23 Apr 2006)
New Revision: 2652

Modified:
   GNUnet/src/applications/fs/ecrs/unindex.c
   GNUnet/src/applications/fs/ecrs/upload.c
   GNUnet/src/applications/fs/fsui/download.c
   GNUnet/src/applications/fs/module/ondemand.c
   GNUnet/src/applications/fs/tools/gnunet-directory.c
   GNUnet/src/util/hashing.c
   GNUnet/src/util/storage.c
Log:
O_LARGEFILE cleanup

Modified: GNUnet/src/applications/fs/ecrs/unindex.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/unindex.c   2006-04-23 22:57:59 UTC (rev 
2651)
+++ GNUnet/src/applications/fs/ecrs/unindex.c   2006-04-23 23:03:44 UTC (rev 
2652)
@@ -233,11 +233,7 @@
     = FS_testIndexed(sock,
                     &fileId);
 
-#ifdef O_LARGEFILE
   fd = fileopen(filename, O_RDONLY | O_LARGEFILE);
-#else
-  fd = fileopen(filename, O_RDONLY);
-#endif
   if (fd == -1) {
     LOG_FILE_STRERROR(LOG_WARNING, "OPEN", filename);
     return SYSERR;

Modified: GNUnet/src/applications/fs/ecrs/upload.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/upload.c    2006-04-23 22:57:59 UTC (rev 
2651)
+++ GNUnet/src/applications/fs/ecrs/upload.c    2006-04-23 23:03:44 UTC (rev 
2652)
@@ -228,11 +228,7 @@
   }
   treedepth = computeDepth(filesize);
 
-#ifdef O_LARGEFILE
   fd = fileopen(filename, O_RDONLY | O_LARGEFILE);
-#else
-  fd = fileopen(filename, O_RDONLY);
-#endif
   if (fd == -1) {
     LOG_FILE_STRERROR(LOG_WARNING, "OPEN", filename);
     return SYSERR;

Modified: GNUnet/src/applications/fs/fsui/download.c
===================================================================
--- GNUnet/src/applications/fs/fsui/download.c  2006-04-23 22:57:59 UTC (rev 
2651)
+++ GNUnet/src/applications/fs/fsui/download.c  2006-04-23 23:03:44 UTC (rev 
2652)
@@ -251,13 +251,8 @@
       fn[strlen(fn)-1] = '\0';
       strcat(fn, GNUNET_DIRECTORY_EXT);
     } 
-#ifdef O_LARGEFILE
     fd = fileopen(fn,
                  O_LARGEFILE | O_RDONLY);
-#else
-    fd = fileopen(fn,
-                 O_RDONLY);
-#endif
     if (fd == -1) {
       LOG_FILE_STRERROR(LOG_ERROR,
                        "OPEN",

Modified: GNUnet/src/applications/fs/module/ondemand.c
===================================================================
--- GNUnet/src/applications/fs/module/ondemand.c        2006-04-23 22:57:59 UTC 
(rev 2651)
+++ GNUnet/src/applications/fs/module/ondemand.c        2006-04-23 23:03:44 UTC 
(rev 2652)
@@ -190,10 +190,7 @@
        fn);
 #endif
     fd = fileopen(fn,
-#ifdef O_LARGEFILE
-                 O_LARGEFILE |
-#endif
-                 O_CREAT|O_WRONLY,
+                 O_LARGEFILE | O_CREAT|O_WRONLY,
                  S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH); /* 644 */
     if(fd == -1) {
       LOG_FILE_STRERROR(LOG_ERROR, "open", fn);
@@ -344,10 +341,7 @@
   fn = getOnDemandFile(&odb->fileId);
 
   fileHandle = fileopen(fn,
-#ifdef O_LARGEFILE
-                       O_LARGEFILE |
-#endif
-                       O_RDONLY,
+                       O_LARGEFILE | O_RDONLY,
                        0);
   if (fileHandle == -1) {
     char unavail_key[256];
@@ -566,11 +560,7 @@
       fn);
 #endif
   fd = fileopen(fn,
-#ifdef O_LARGEFILE
            O_RDONLY | O_LARGEFILE,
-#else
-           O_RDONLY,
-#endif
            S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH); /* 644 */
   if(fd == -1) {
     LOG_FILE_STRERROR(LOG_ERROR, "open", fn);

Modified: GNUnet/src/applications/fs/tools/gnunet-directory.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-directory.c 2006-04-23 22:57:59 UTC 
(rev 2651)
+++ GNUnet/src/applications/fs/tools/gnunet-directory.c 2006-04-23 23:03:44 UTC 
(rev 2652)
@@ -82,13 +82,8 @@
     return;
   }
   md = NULL;
-#ifdef O_LARGEFILE
   fd = fileopen(name,
                O_LARGEFILE | O_RDONLY);
-#else
-  fd = fileopen(name,
-               O_RDONLY);
-#endif
   if (fd == -1) {
     LOG_FILE_STRERROR(LOG_ERROR, "open", name);
     ret = -1;

Modified: GNUnet/src/util/hashing.c
===================================================================
--- GNUnet/src/util/hashing.c   2006-04-23 22:57:59 UTC (rev 2651)
+++ GNUnet/src/util/hashing.c   2006-04-23 23:03:44 UTC (rev 2652)
@@ -332,12 +332,7 @@
                        &len))
     return SYSERR;
   fh = fileopen(filename,
-#ifdef O_LARGEFILE
-               O_RDONLY | O_LARGEFILE
-#else
-               O_RDONLY
-#endif
-           );
+               O_RDONLY | O_LARGEFILE);
   if (fh == -1) {
     LOG_FILE_STRERROR(LOG_ERROR, "open", filename);
     return SYSERR;

Modified: GNUnet/src/util/storage.c
===================================================================
--- GNUnet/src/util/storage.c   2006-04-23 22:57:59 UTC (rev 2651)
+++ GNUnet/src/util/storage.c   2006-04-23 23:03:44 UTC (rev 2652)
@@ -713,18 +713,11 @@
 
   buf = MALLOC(COPY_BLK_SIZE);
   pos = 0;
-  in = fileopen(src, O_RDONLY
-#ifdef O_LARGEFILE
-               | O_LARGEFILE
-#endif
-               );
+  in = fileopen(src, O_RDONLY | O_LARGEFILE);
   if (in == -1)
     return SYSERR;
   out = fileopen(dst,
-#ifdef O_LARGEFILE
-                O_LARGEFILE |
-#endif
-                O_WRONLY | O_CREAT | O_EXCL,
+                O_LARGEFILE | O_WRONLY | O_CREAT | O_EXCL,
                 S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
   if (out == -1) {
     closefile(in);