Changeset 2347 for box/trunk/test

Timestamp:

11/10/2008 22:00:18 (4 years ago)

Author:

chris

Message:

Add missing extern "C" on intercept function definitions in
testbbackupd.

Fix assignment of string constants to non-const char pointers.

File:

• box/trunk/test/bbackupd/testbbackupd.cpp (modified) (8 diffs)

box/trunk/test/bbackupd/testbbackupd.cpp

@@ -758 +758 @@
 // We set up the next intercept for the same directory by passing NULL.
 
-struct dirent *readdir_test_hook_2(DIR *dir);
+extern "C" struct dirent *readdir_test_hook_2(DIR *dir);
 
 #ifdef LINUX_WEIRD_LSTAT
-int lstat_test_hook(int ver, const char *file_name, struct stat *buf);
+extern "C" int lstat_test_hook(int ver, const char *file_name, struct stat *buf);
 #else
-int lstat_test_hook(const char *file_name, struct stat *buf);
+extern "C" int lstat_test_hook(const char *file_name, struct stat *buf);
 #endif
 
-struct dirent *readdir_test_hook_1(DIR *dir)
+extern "C" struct dirent *readdir_test_hook_1(DIR *dir)
 {
 #ifndef PLATFORM_CLIB_FNS_INTERCEPTION_IMPOSSIBLE
@@ -777 +777 @@
 // new filenames until the timer expires, then disables the intercept.
 
-struct dirent *readdir_test_hook_2(DIR *dir)
+extern "C" struct dirent *readdir_test_hook_2(DIR *dir)
 {
         if (time(NULL) >= readdir_stop_time)
@@ -813 +813 @@
 
 #ifdef LINUX_WEIRD_LSTAT
-int lstat_test_hook(int ver, const char *file_name, struct stat *buf)
+extern "C" int lstat_test_hook(int ver, const char *file_name, struct stat *buf)
 #else
-int lstat_test_hook(const char *file_name, struct stat *buf)
+extern "C" int lstat_test_hook(const char *file_name, struct stat *buf)
 #endif
 {
@@ -1667 +1667 @@
                 // create a new file to force an upload
 
-                char* new_file = "testfiles/TestDir1/force-upload-2";
+                const char* new_file = "testfiles/TestDir1/force-upload-2";
                 int fd = open(new_file, 
                         O_CREAT | O_EXCL | O_WRONLY, 0700);
@@ -1676 +1676 @@
                 TEST_THAT(fd > 0);
         
-                char* control_string = "whee!\n";
+                const char* control_string = "whee!\n";
                 TEST_THAT(write(fd, control_string, 
                         strlen(control_string)) ==
@@ -2419 +2419 @@
                         // runs the SyncAllowScript again.
 
-                        char* sync_control_file = "testfiles" 
+                        const char* sync_control_file = "testfiles" 
                                 DIRECTORY_SEPARATOR "syncallowscript.control";
                         int fd = open(sync_control_file, 
@@ -2429 +2429 @@
                         TEST_THAT(fd > 0);
                 
-                        char* control_string = "10\n";
+                        const char* control_string = "10\n";
                         TEST_THAT(write(fd, control_string, 
                                 strlen(control_string)) ==
@@ -2438 +2438 @@
                         // every 10 seconds to see if they are allowed again.
 
-                        char* new_test_file = "testfiles"
+                        const char* new_test_file = "testfiles"
                                 DIRECTORY_SEPARATOR "TestDir1"
                                 DIRECTORY_SEPARATOR "Added_During_Pause";