Changeset 18692 for trunk/base

Timestamp:

Jul 23, 2006, 12:36:42 AM (18 years ago)

Author:

pguyot (Paul Guyot)

Message:

Prefix internal functions and use inline to avoid them to be inserted.

File:

• trunk/base/src/darwintracelib1.0/darwintrace.c (modified) (9 diffs)

trunk/base/src/darwintracelib1.0/darwintrace.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
- * $Id: darwintrace.c,v 1.13 2006/07/22 03:12:58 pguyot Exp $
+ * $Id: darwintrace.c,v 1.14 2006/07/23 00:36:42 pguyot Exp $
  *
  * @APPLE_BSD_LICENSE_HEADER_START@
@@ -80 +80 @@
  * Prototypes.
  */
-void log_op(const char* op, const char* procname, const char* path, int fd);
-void __darwintrace_setup();
+inline void __darwintrace_log_op(const char* op, const char* procname, const char* path, int fd);
+inline void __darwintrace_setup();
 inline void __darwintrace_cleanup_path(char *path);
 
@@ -147 +147 @@
  * fd:                  a fd to the file, or 0 if we don't have any.
  */
-void log_op(const char* op, const char* procname, const char* path, int fd) {
+inline void __darwintrace_log_op(const char* op, const char* procname, const char* path, int fd) {
 #if !DARWINTRACE_SHOW_PROCESS
         #pragma unused(procname)
@@ -268 +268 @@
                                 if (__darwintrace_fd >= 0) {
                                     dprintf("darwintrace: original open path is %s\n", path);
-                                        log_op("open", NULL, path, result);
+                                        __darwintrace_log_op("open", NULL, path, result);
                                 }
 #if DARWINTRACE_LOG_CREATE
@@ -275 +275 @@
                                 if (__darwintrace_fd >= 0) {
                                     dprintf("darwintrace: original create path is %s\n", path);
-                                        log_op("create", NULL, path, result);
+                                        __darwintrace_log_op("create", NULL, path, result);
                                 }
 #endif
@@ -299 +299 @@
           if (__darwintrace_fd >= 0) {
             dprintf("darwintrace: original readlink path is %s\n", path);
-                log_op("readlink", NULL, path, 0);
+                __darwintrace_log_op("readlink", NULL, path, 0);
           }
         }
@@ -327 +327 @@
             if(S_ISLNK(sb.st_mode)) {
               /* for symlinks, print both */
-                  log_op("execve", NULL, path, 0);
+                  __darwintrace_log_op("execve", NULL, path, 0);
             }
                 
@@ -336 +336 @@
         
                   /* once we have an open fd, if a full path was requested, do it */
-                  log_op("execve", NULL, path, fd);
+                  __darwintrace_log_op("execve", NULL, path, fd);
 
                   /* read the file for the interpreter */
@@ -369 +369 @@
                           }
 #endif
-                          log_op("execve", procname, interp, 0);
+                          __darwintrace_log_op("execve", procname, interp, 0);
                         }
                   }