Changeset 80129

Timestamp:

07/04/11 20:53:54 (4 years ago)

Author:

jmr@…

Message:

merge r80069 from trunk:

Rename dprintf to debug_printf to avoid name clash with POSIX

Location:

branches/release_2_0

Files:

• . (modified) (1 prop)
• base (modified) (1 prop)
• base/portmgr/fedora/macports.spec (modified) (1 prop)
• base/src/darwintracelib1.0/darwintrace.c (modified) (12 diffs)
• base/src/pextlib1.0/sha2.c (modified) (1 prop)
• base/src/pextlib1.0/sha2.h (modified) (1 prop)
• base/src/pextlib1.0/sha256cmd.c (modified) (1 prop)
• base/src/pextlib1.0/sha256cmd.h (modified) (1 prop)
• base/src/registry2.0/receipt_sqlite.tcl (modified) (1 prop)

branches/release_2_0/base/src/darwintracelib1.0/darwintrace.c

@@ -164 +164 @@
 #if __STDC_VERSION__>=199901L
 #if DARWINTRACE_DEBUG_OUTPUT
-#define dprintf(...) fprintf(stderr, __VA_ARGS__)
+#define debug_printf(...) fprintf(stderr, __VA_ARGS__)
 #else
-#define dprintf(...)
+#define debug_printf(...)
 #endif
 #else
@@ -172 +172 @@
 __attribute__ ((format (printf, 1, 2)))
 static inline
-int dprintf(const char *format, ...) {
+int debug_printf(const char *format, ...) {
     int ret;
     va_list args;
@@ -181 +181 @@
 }
 #else
-#define dprintf(format, param)
+#define debug_printf(format, param)
 #endif
 #endif
@@ -363 +363 @@
                         if(connect(sock, (struct sockaddr*)&sun, strlen(__env_darwintrace_log)+1+sizeof(sun.sun_family))!=-1)
                         {
-                                dprintf("darwintrace: connect successful. socket %d\n", sock);
+                                debug_printf("darwintrace: connect successful. socket %d\n", sock);
                                 __darwintrace_fd=sock;
                                 ask_for_filemap();
                         } else {
-                                dprintf("connect failed: %s\n", strerror(errno));
+                                debug_printf("connect failed: %s\n", strerror(errno));
                                 abort();
                         }
@@ -470 +470 @@
   }
 
-  dprintf("darwintrace: cleanup resulted in %s\n", path);
+  debug_printf("darwintrace: cleanup resulted in %s\n", path);
 }
 
@@ -664 +664 @@
                 isInSandbox = __darwintrace_is_in_sandbox(path, newpath);
                 if (isInSandbox == 0) {
-                        dprintf("darwintrace: creation/writing was forbidden at %s\n", path);
+                        debug_printf("darwintrace: creation/writing was forbidden at %s\n", path);
                         errno = EACCES;
                         result = -1;
@@ -810 +810 @@
         int isInSandbox = __darwintrace_is_in_sandbox(path, 0);
         if (isInSandbox == 1) {
-                dprintf("darwintrace: unlink was allowed at %s\n", path);
+                debug_printf("darwintrace: unlink was allowed at %s\n", path);
         } else if (isInSandbox == 0) {
                 /* outside sandbox, but sandbox is defined: forbid */
-                dprintf("darwintrace: unlink was forbidden at %s\n", path);
+                debug_printf("darwintrace: unlink was forbidden at %s\n", path);
                 errno = EACCES;
                 result = -1;
@@ -832 +832 @@
         int isInSandbox = __darwintrace_is_in_sandbox(path, 0);
         if (isInSandbox == 1) {
-                dprintf("darwintrace: mkdir was allowed at %s\n", path);
+                debug_printf("darwintrace: mkdir was allowed at %s\n", path);
         } else if (isInSandbox == 0) {
                 /* outside sandbox, but sandbox is defined: forbid */
@@ -841 +841 @@
                 if ((err == -1) && (errno == ENOENT))
                 {
-                        dprintf("darwintrace: mkdir was forbidden at %s\n", path);
+                        debug_printf("darwintrace: mkdir was forbidden at %s\n", path);
                         errno = EACCES;
                         result = -1;
@@ -862 +862 @@
         int isInSandbox = __darwintrace_is_in_sandbox(path, 0);
         if (isInSandbox == 1) {
-                dprintf("darwintrace: rmdir was allowed at %s\n", path);
+                debug_printf("darwintrace: rmdir was allowed at %s\n", path);
         } else if (isInSandbox == 0) {
                 /* outside sandbox, but sandbox is defined: forbid */
-                dprintf("darwintrace: removing directory %s was forbidden\n", path);
+                debug_printf("darwintrace: removing directory %s was forbidden\n", path);
                 errno = EACCES;
                 result = -1;
@@ -884 +884 @@
         int isInSandbox = __darwintrace_is_in_sandbox(from, 0);
         if (isInSandbox == 1) {
-                dprintf("darwintrace: rename was allowed at %s\n", from);
+                debug_printf("darwintrace: rename was allowed at %s\n", from);
         } else if (isInSandbox == 0) {
                 /* outside sandbox, but sandbox is defined: forbid */
-                dprintf("darwintrace: renaming from %s was forbidden\n", from);
+                debug_printf("darwintrace: renaming from %s was forbidden\n", from);
                 errno = EACCES;
                 result = -1;
@@ -895 +895 @@
                 isInSandbox = __darwintrace_is_in_sandbox(to, 0);
                 if (isInSandbox == 1) {
-                        dprintf("darwintrace: rename was allowed at %s\n", to);
+                        debug_printf("darwintrace: rename was allowed at %s\n", to);
                 } else if (isInSandbox == 0) {
                         /* outside sandbox, but sandbox is defined: forbid */
-                        dprintf("darwintrace: renaming to %s was forbidden\n", to);
+                        debug_printf("darwintrace: renaming to %s was forbidden\n", to);
                         errno = EACCES;
                         result = -1;