cadey
/
elemental-ircd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cleanups to 005 code, from ratbox (androsyn).

This commit is contained in:
Jilles Tjoelker 2008-03-18 23:28:03 +01:00
parent 4d17e288b4
commit 58067bff67
2 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/supported.h
View File

@ -35,14 +35,14 @@
#ifndef INCLUDED_supported_h #ifndef INCLUDED_supported_h
#define INCLUDED_supported_h #define INCLUDED_supported_h
extern void add_isupport(const char *, const char *(*)(void *), void *); extern void add_isupport(const char *, const char *(*)(const void *), const void *);
extern void delete_isupport(const char *); extern void delete_isupport(const char *);
extern void show_isupport(struct Client *); extern void show_isupport(struct Client *);
extern void init_isupport(void); extern void init_isupport(void);
extern const char *isupport_intptr(void *); extern const char *isupport_intptr(const void *);
extern const char *isupport_boolean(void *); extern const char *isupport_boolean(const void *);
extern const char *isupport_string(void *); extern const char *isupport_string(const void *);
extern const char *isupport_stringptr(void *); extern const char *isupport_stringptr(const void *);
#endif /* INCLUDED_supported_h */ #endif /* INCLUDED_supported_h */

45
src/supported.c
View File

@ -87,19 +87,20 @@
#include "numeric.h" #include "numeric.h"
#include "ircd.h" #include "ircd.h"
#include "s_conf.h" #include "s_conf.h"
#include "supported.h"
dlink_list isupportlist; dlink_list isupportlist;
struct isupportitem struct isupportitem
{ {
const char *name; const char *name;
const char *(*func)(void *); const char *(*func)(const void *);
void *param; const void *param;
dlink_node node; dlink_node node;
}; };
void void
add_isupport(const char *name, const char *(*func)(void *), void *param) add_isupport(const char *name, const char *(*func)(const void *), const void *param)
{ {
struct isupportitem *item; struct isupportitem *item;
@ -137,7 +138,7 @@ show_isupport(struct Client *client_p)
const char *value; const char *value;
char buf[512]; char buf[512];
int extra_space; int extra_space;
int nchars, nparams; unsigned int nchars, nparams;
int l; int l;
extra_space = strlen(client_p->name); extra_space = strlen(client_p->name);
@ -177,37 +178,35 @@ show_isupport(struct Client *client_p)
} }
const char * const char *
isupport_intptr(void *ptr) isupport_intptr(const void *ptr)
{ {
static char buf[15]; static char buf[15];
ircsnprintf(buf, sizeof buf, "%d", *(const int *)ptr);
ircsnprintf(buf, sizeof buf, "%d", *(int *)ptr);
return buf; return buf;
} }
const char * const char *
isupport_boolean(void *ptr) isupport_boolean(const void *ptr)
{ {
return *(int *)ptr ? "" : NULL; return *(const int *)ptr ? "" : NULL;
} }
const char * const char *
isupport_string(void *ptr) isupport_string(const void *ptr)
{ {
return (const char *)ptr; return (const char *)ptr;
} }
const char * const char *
isupport_stringptr(void *ptr) isupport_stringptr(const void *ptr)
{ {
return *(char * const *)ptr;
return *(const char **)ptr;
} }
const char * static const char *
isupport_chanmodes(void *ptr) isupport_chanmodes(const void *ptr)
{ {
static char result[80]; static char result[80];
@ -220,8 +219,8 @@ isupport_chanmodes(void *ptr)
return result; return result;
} }
const char * static const char *
isupport_chanlimit(void *ptr) isupport_chanlimit(const void *ptr)
{ {
static char result[30]; static char result[30];
@ -229,8 +228,8 @@ isupport_chanlimit(void *ptr)
return result; return result;
} }
const char * static const char *
isupport_maxlist(void *ptr) isupport_maxlist(const void *ptr)
{ {
static char result[30]; static char result[30];
@ -241,8 +240,8 @@ isupport_maxlist(void *ptr)
return result; return result;
} }
const char * static const char *
isupport_targmax(void *ptr) isupport_targmax(const void *ptr)
{ {
static char result[200]; static char result[200];
@ -252,8 +251,8 @@ isupport_targmax(void *ptr)
return result; return result;
} }
const char * static const char *
isupport_extban(void *ptr) isupport_extban(const void *ptr)
{ {
const char *p; const char *p;
static char result[200]; static char result[200];