Bugzilla Bug 303345: just use c2pstrcpy directly. This patch is
authorwtchang%redhat.com
Sat, 06 Aug 2005 00:05:09 +0000
changeset 3428 9a7b5fd6eb9b52417e7af2e74fcfb8995f3f5a8f
parent 3427 d38e3ac46d84f70895fc44539815ec36529f49ad
child 3429 7817af1f67ce2212c0871d10f2b4c2abf7a02a72
push idunknown
push userunknown
push dateunknown
bugs303345
Bugzilla Bug 303345: just use c2pstrcpy directly. This patch is contributed by Mark Mentovai <mark@moxienet.com>. r=wtc.
pr/src/linking/prlink.c
--- a/pr/src/linking/prlink.c
+++ b/pr/src/linking/prlink.c
@@ -45,18 +45,16 @@
 #include <TextUtils.h>
 #include <Types.h>
 #include <Aliases.h>
 #include <CFURL.h>
 #include <CFBundle.h>
 #include <CFString.h>
 #include <CFDictionary.h>
 #include <CFData.h>
-
-#define PStrFromCStr(src, dst) c2pstrcpy(dst, src)
 #endif
 
 #ifdef XP_UNIX
 #ifdef USE_DLFCN
 #include <dlfcn.h>
 /* Define these on systems that don't have them. */
 #ifndef RTLD_NOW
 #define RTLD_NOW 0
@@ -1160,17 +1158,17 @@ pr_FindSymbolInLib(PRLibrary *lm, const 
     }
     if (lm->connection) {
         Ptr                 symAddr;
         CFragSymbolClass    symClass;
         Str255              pName;
         
         PR_LOG(_pr_linker_lm, PR_LOG_MIN, ("Looking up symbol: %s", name + 1));
         
-        PStrFromCStr(name + 1, pName);
+        c2pstrcpy(pName, name + 1);
         
         f = (FindSymbol(lm->connection, pName, &symAddr, &symClass) == noErr) ? symAddr : NULL;
         
         /* callers expect mach-o function pointers, so must wrap tvectors with glue. */
         if (f && symClass == kTVectorCFragSymbol) {
             f = TV2FP(lm->wrappers, name + 1, f);
         }