Ethereal-dev: [Ethereal-dev] [0.10.13] Don't use dirname as a variable

Note: This archive is from the project's previous web site, ethereal.com. This list is no longer active.

Date Index Thread Index Other Months All Mailing Lists
Date Prev Date Next Thread Prev Thread Next
From: Albert Chin <ethereal-dev@xxxxxxxxxxxxxxxxxxxxxxxxx>
Date: Thu, 10 Nov 2005 15:13:55 -0600
Using dirname as a variable causes problems on Tru64 UNIX 5.1 where
<string.h> defines the dirname() function.

-- 
albert chin (china@xxxxxxxxxxxxxxxxxx)

-- snip snip
Index: epan/dtd_preparse.l
===================================================================
--- epan/dtd_preparse.l.orig	2005-10-11 12:56:08.000000000 -0500
+++ epan/dtd_preparse.l	2005-11-10 15:09:59.890314000 -0600
@@ -52,7 +52,7 @@
 gchar* entity_name;
 GString* error;
 
-const gchar* dirname;
+const gchar* dtd_dirname;
 const gchar* filename;
 guint linenum;
 
@@ -163,7 +163,7 @@
 extern GString* dtd_preparse(const gchar* dname,const  gchar* fname, GString* err) {
 	gchar* fullname = g_strdup_printf("%s%c%s",dname,G_DIR_SEPARATOR,fname);
     
-	dirname = dname;
+	dtd_dirname = dname;
 	filename = fname;
 	linenum = 1;