Changeset 86Tweet

Timestamp:

Mar 6, 2008, 2:10:10 PM (14 years ago)

Author:

Sam Hocevar

Message:

• Get rid of nonexistent macify_name() function. According to the original source tree, this function simply replaced slashes with underscores in filenames.

Location:

abuse/trunk/src

Files:

• cache.cpp (modified) (2 diffs)
• game.cpp (modified) (2 diffs)
• imlib/specs.cpp (modified) (3 diffs)

abuse/trunk/src/cache.cpp

@@ -671 +671 @@
 }
 
-extern char *macify_name(char *s);
-
 void cache_list::create_lcache()
 {
@@ -689 +687 @@
 #if defined( __APPLE__ )
                 unlink(lfname);
-#if (defined(__APPLE__) && !defined(__MACH__))
-                macify_name(lfname);
-#endif
                 FILE *fp=fopen(lfname,"wb");
                 if (fp)

abuse/trunk/src/game.cpp

@@ -81 +81 @@
 extern int confirm_quit();
 
-#if(defined(__APPLE__) && !defined(__MACH__))
-extern char *macify_name(char *s);
-#endif
-
 // Enabled TCPIP driver
 #include "tcpip.hpp"
@@ -97 +93 @@
     else
         strcpy(tmp_name, filename);
-#if(defined(__APPLE__) && !defined(__MACH__))
-    macify_name(tmp_name);
-#endif
     return fopen(tmp_name, mode);
 }
-
 
 void handle_no_space()

abuse/trunk/src/imlib/specs.cpp

@@ -27 +27 @@
 #include "jmalloc.hpp"
 #include "dprint.hpp"
-
-#if (defined(__APPLE__) && !defined(__MACH__))
-extern char *macify_name(char *s);
-#endif
 
 char const *spec_types[] =
@@ -296 +292 @@
 void fast_load_start_recording(char *filename)
 {
-#if (defined(__APPLE__) && !defined(__MACH__))
-  fast_load_fd = ::open(macify_name(filename),O_BINARY|O_CREAT|O_RDWR);
-#else
-  fast_load_fd = ::open(filename,O_CREAT|O_RDWR,S_IRWXU | S_IRWXG | S_IRWXO);
-#endif
-        fast_load_mode = 1;
+    fast_load_fd = ::open(filename,O_CREAT|O_RDWR,S_IRWXU | S_IRWXG | S_IRWXO);
+    fast_load_mode = 1;
 }
 
 void fast_load_stop_recording()
 {
-        fast_load_mode = 0;
+    fast_load_mode = 0;
 }
 
 void fast_load_start_reloading(char *filename)
 {
-#if (defined(__APPLE__) && !defined(__MACH__))
-  fast_load_fd = ::open(macify_name(filename),O_BINARY|O_RDONLY);
-#else
-  fast_load_fd = ::open(filename,O_RDONLY);
-#endif
-        fast_load_mode = 2;
+    fast_load_fd = ::open(filename,O_RDONLY);
+    fast_load_mode = 2;
 }
 
 void fast_load_stop_reloading()
 {
-        fast_load_mode = 0;
+    fast_load_mode = 0;
 }
 
@@ -356 +344 @@
     flags|=O_CREAT|O_RDWR;
 
-#if (defined(__APPLE__) && !defined(__MACH__))
-    fd=open(macify_name(tmp_name),flags);
-#else
     fd=open(tmp_name,flags,S_IRWXU | S_IRWXG | S_IRWXO);
-#endif
   } else 
-#if (defined(__APPLE__) && !defined(__MACH__))
-    fd=open(macify_name(tmp_name),flags);
-#else
     fd=open(tmp_name,flags);
-#endif
 
 //  umask(old_mask);