Changeset 1229

Timestamp:

29/12/2006 17:18:17 (5 years ago)

Author:

chris

Message:

Compile fix for platforms without intercept capability (refs #3)

Location:

box/chris/merge

Files:

• lib/common/BoxPlatform.h (modified) (1 diff)
• lib/intercept/intercept.h (modified) (2 diffs)
• test/bbackupd/testbbackupd.cpp (modified) (5 diffs)

box/chris/merge/lib/common/BoxPlatform.h

@@ -51 +51 @@
         #define PLATFORM_CLIB_FNS_INTERCEPTION_IMPOSSIBLE
 #endif
+
+        #define PLATFORM_CLIB_FNS_INTERCEPTION_IMPOSSIBLE
 
 // Disable memory testing under Darwin, it just doesn't like it very much.

box/chris/merge/lib/intercept/intercept.h

@@ -10 +10 @@
 #ifndef INTERCEPT_H
 #define INTERCEPT_H
+#ifndef PLATFORM_CLIB_FNS_INTERCEPTION_IMPOSSIBLE
 
 #include <dirent.h>
@@ -36 +37 @@
 void intercept_setup_error(const char *filename, unsigned int errorafter, 
         int errortoreturn, int syscalltoerror);
+void intercept_setup_delay(const char *filename, unsigned int delay_after,
+        int delay_ms, int syscall_to_delay, int num_delays);
+bool intercept_triggered();
 
 void intercept_setup_readdir_hook(const char *dirname,  readdir_t hookfn);
 void intercept_setup_lstat_hook  (const char *filename, lstat_t   hookfn);
 
+#endif // !PLATFORM_CLIB_FNS_INTERCEPTION_IMPOSSIBLE
 #endif // !INTERCEPT_H

box/chris/merge/test/bbackupd/testbbackupd.cpp

@@ -10 +10 @@
 #include "Box.h"
 
+#include <dirent.h>
 #include <stdio.h>
 #include <sys/types.h>
@@ -510 +511 @@
 }
 
-void intercept_setup_delay(const char *filename, unsigned int delay_after,
-        int delay_ms, int syscall_to_delay, int num_delays);
-
-bool intercept_triggered();
-
 int start_internal_daemon()
 {
@@ -599 +595 @@
 struct dirent *readdir_test_hook_1(DIR *dir)
 {
+#ifndef PLATFORM_CLIB_FNS_INTERCEPTION_IMPOSSIBLE
         intercept_setup_readdir_hook(NULL, readdir_test_hook_2);
+#endif
         return NULL;
 }
@@ -610 +608 @@
         if (time(NULL) >= readdir_stop_time)
         {
+#ifndef PLATFORM_CLIB_FNS_INTERCEPTION_IMPOSSIBLE
                 intercept_setup_readdir_hook(NULL, NULL);
                 intercept_setup_lstat_hook  (NULL, NULL);
+#endif
                 // we will not be called again.
         }
@@ -627 +627 @@
                 "testfiles/TestDir1/spacetest/d1/test.%d", 
                 readdir_test_counter);
+#ifndef PLATFORM_CLIB_FNS_INTERCEPTION_IMPOSSIBLE
         intercept_setup_lstat_hook(stat_hook_filename, lstat_test_hook);
+#endif
 
         return &readdir_test_dirent;