Changeset 10634

Timestamp:

May 6, 2010, 5:02:31 PM (11 years ago)

Author:

charles

Message:

re-tweak the previous commit based on feedback from kklimonda

Location:

trunk/libtransmission

Files:

• bencode.c (modified) (2 diffs)
• fdlimit.c (modified) (2 diffs)
• makemeta.c (modified) (1 diff)
• platform.c (modified) (1 diff)
• platform.h (modified) (1 diff)

trunk/libtransmission/bencode.c

@@ -32 +32 @@
 #include "json.h"
 #include "list.h"
-#include "platform.h" /* MAX_PATH_LEN */
+#include "platform.h" /* TR_PATH_MAX */
 #include "ptrarray.h"
 #include "utils.h" /* tr_new(), tr_free() */
@@ -1622 +1622 @@
     int fd;
     int err = 0;
-    char buf[TR_MAX_PATH];
+    char buf[TR_PATH_MAX];
 
     /* follow symlinks to find the "real" file, to make sure the temporary

trunk/libtransmission/fdlimit.c

@@ -68 +68 @@
 #include "fdlimit.h"
 #include "net.h"
-#include "platform.h" /* TR_MAX_PATH, TR_PATH_DELIMITER */
+#include "platform.h" /* TR_PATH_MAX, TR_PATH_DELIMITER */
 #include "session.h"
 #include "torrent.h" /* tr_isTorrent() */
@@ -88 +88 @@
     int              torrentId;
     tr_file_index_t  fileNum;
-    char             filename[TR_MAX_PATH];
+    char             filename[TR_PATH_MAX];
     int              fd;
     uint64_t         date;

trunk/libtransmission/makemeta.c

@@ -316 +316 @@
     for( prev = pch = file->filename + topLen; ; ++pch )
     {
-        char buf[TR_MAX_PATH];
+        char buf[TR_PATH_MAX];
 
         if( *pch && *pch != TR_PATH_DELIMITER )

trunk/libtransmission/platform.c

@@ -441 +441 @@
             s = tr_buildPath( appdata, appname, NULL );
 #elif defined( __HAIKU__ )
-            char buf[TR_MAX_PATH];
+            char buf[TR_PATH_MAX];
             find_directory( B_USER_SETTINGS_DIRECTORY, -1, true, buf, sizeof(buf) );
             s = tr_buildPath( buf, appname, NULL );

trunk/libtransmission/platform.h

@@ -28 +28 @@
 #ifdef WIN32
  #include <windows.h> /* MAX_PATH */
+ #define TR_PATH_MAX MAX_PATH
 #else
- #include <limits.h> /* MAX_PATH */
-#endif
-#ifdef MAX_PATH
- #define TR_MAX_PATH MAX_PATH
-#else
- #define TR_MAX_PATH 4096
+ #include <limits.h> /* PATH_MAX */
+ #ifdef PATH_MAX
+  #define TR_PATH_MAX PATH_MAX
+ #else
+  #define TR_PATH_MAX 4096
+ #endif
 #endif