Remove irc_basename, replace it with rb_basename from libratbox.

diff --git a/include/modules.h b/include/modules.h
index d61061adc795eec045ccd920b10c899920a9457a..8d812159bebb7e99db650ee62223bfb65bba29c4 100644 (file)
--- a/include/modules.h
+++ b/include/modules.h
@@ -116,7 +116,6 @@ extern int unload_one_module(const char *, int);
 extern int load_one_module(const char *, int);
 extern int load_a_module(const char *, int, int);
 extern int findmodule_byname(const char *);
-extern char *irc_basename(const char *);
 extern void modules_init(void);
 
 #endif /* INCLUDED_modules_h */

diff --git a/src/ircd_parser.y b/src/ircd_parser.y
index 1da9398cf4f6a4fe1176c8a8f19b16330a1b9714..90f183a014f5fe9969ebd9bc9bba0a72d4a8ddb8 100644 (file)
--- a/src/ircd_parser.y
+++ b/src/ircd_parser.y
@@ -296,7 +296,7 @@ loadmodule:
 #ifndef STATIC_MODULES
               char *m_bn;
 
-              m_bn = irc_basename((char *) $2);
+              m_bn = rb_basename((char *) $2);
 
               if (findmodule_byname(m_bn) == -1)
                  load_one_module($2, 0);

diff --git a/src/modules.c b/src/modules.c
index 0d5cab54bed95fb3a87fb9b15c06b8f8295419fd..dd977e53c05c1438b031d4cce7ed331ba2f37b49 100644 (file)
--- a/src/modules.c
+++ b/src/modules.c
@@ -189,27 +189,6 @@ mod_clear_paths(void)
        mod_paths.length = 0;
 }
 
-/* irc_basename
- *
- * input       -
- * output      -
- * side effects -
- */
-char *
-irc_basename(const char *path)
-{
-       char *mod_basename = rb_malloc(strlen(path) + 1);
-       const char *s;
-
-       if(!(s = strrchr(path, '/')))
-               s = path;
-       else
-               s++;
-
-       (void) strcpy(mod_basename, s);
-       return mod_basename;
-}
-
 /* findmodule_byname
  *
  * input        -
@@ -357,7 +336,7 @@ mo_modload(struct Client *client_p, struct Client *source_p, int parc, const cha
                return 0;
        }
 
-       m_bn = irc_basename(parv[1]);
+       m_bn = rb_basename(parv[1]);
 
        if(findmodule_byname(m_bn) != -1)
        {
@@ -388,7 +367,7 @@ mo_modunload(struct Client *client_p, struct Client *source_p, int parc, const c
                return 0;
        }
 
-       m_bn = irc_basename(parv[1]);
+       m_bn = rb_basename(parv[1]);
 
        if((modindex = findmodule_byname(m_bn)) == -1)
        {
@@ -428,7 +407,7 @@ mo_modreload(struct Client *client_p, struct Client *source_p, int parc, const c
                return 0;
        }
 
-       m_bn = irc_basename(parv[1]);
+       m_bn = rb_basename(parv[1]);
 
        if((modindex = findmodule_byname(m_bn)) == -1)
        {
@@ -793,7 +772,7 @@ load_a_module(const char *path, int warn, int core)
 
        int *mapi_version;
 
-       mod_basename = irc_basename(path);
+       mod_basename = rb_basename(path);
 
 #ifdef CHARYBDIS_PROFILE
        tmpptr = dlopen(path, RTLD_NOW | RTLD_LOCAL | RTLD_PROFILE);

diff --git a/src/newconf.c b/src/newconf.c
index 35a18f81b91b02f334976bf6d613a9c90d7e551b..f2ccf68db9363e9705a768fb4272b7893c9d1932 100644 (file)
--- a/src/newconf.c
+++ b/src/newconf.c
@@ -263,7 +263,7 @@ conf_set_modules_module(void *data)
 #ifndef STATIC_MODULES
        char *m_bn;
 
-       m_bn = irc_basename((char *) data);
+       m_bn = rb_basename((char *) data);
 
        if(findmodule_byname(m_bn) != -1)
                return;