[PATCH] removal of unused execute() function
Wez Furlong <[email protected]> Fri, 31 Jan 2003 00:33:46 +0000 (GMT)
| Newsgroups | gmane.network.irc.irssi.devel |
|---|---|
| Message-ID | <[email protected]> |
Hi there, The execute function define in src/core/misc.[ch] causes a symbol conflict when building the php module for irssi (the Zend Engine uses an execute function to run the compiled scripts). The attached patch #ifdefs the irssi execute function out of the main irssi executeable. If this function really is used somewhere (I couldn't find any reference withing the code), then I would propose renaming it to something less likely to conflict. --Wez. aka: [email protected] PS: I did post an announcement of the PHP irssi module, but can't see it on the mailing list archives. The PHP module requires a development version of PHP 5, so it is not recommended for non-PHP developers to experiment with at this time. However, the brave among you can check it out from the PHP CVS repository; see http://www.php.net/anoncvs.php and checkout the embed/php-irssi module. There are bugs and I cannot offer support; use at your own risk!
irssi-exec.diff
(text/plain, 1.2 KB)
Index: src/core/misc.c
===================================================================
RCS file: /home/cvs/irssi/src/core/misc.c,v
retrieving revision 1.43
diff -u -p -r1.43 misc.c
--- src/core/misc.c 8 Jan 2003 20:54:36 -0000 1.43
+++ src/core/misc.c 31 Jan 2003 00:13:04 -0000
@@ -173,6 +173,7 @@ int strarray_find(char **array, const ch
return -1;
}
+#if 0
int execute(const char *cmd)
{
char **args;
@@ -203,6 +204,7 @@ int execute(const char *cmd)
return 0;
#endif
}
+#endif
GSList *gslist_find_string(GSList *list, const char *key)
{
Index: src/core/misc.h
===================================================================
RCS file: /home/cvs/irssi/src/core/misc.h,v
retrieving revision 1.19
diff -u -p -r1.19 misc.h
--- src/core/misc.h 28 Dec 2002 17:54:13 -0000 1.19
+++ src/core/misc.h 31 Jan 2003 00:13:04 -0000
@@ -21,7 +21,9 @@ int strarray_length(char **array);
/* return index of `item' in `array' or -1 if not found */
int strarray_find(char **array, const char *item);
+#if 0
int execute(const char *cmd); /* returns pid or -1 = error */
+#endif
GSList *gslist_find_string(GSList *list, const char *key);
GSList *gslist_find_icase_string(GSList *list, const char *key);