Kyoshiro/bip
1
0
Fork 0
forked from bip/bip
Code Pull Requests Activity

Fix build errors on armel

Browse Source 
sys/user.h on armel has a conflicting definition of 'struct user'.
This patch renames bip's structure to avoid the conflict.
Thanks to Philipp Kern and Dann Frazier !
This commit is contained in:
Pierre-Louis Bonicoli 2011-01-15 17:53:46 +01:00
parent 4d4710acb9
commit 81b8ed48cf
5 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/bip.c
View File

@ -56,7 +56,7 @@ list_t *parse_conf(FILE *file, int *err);
void conf_die(bip_t *bip, char *fmt, ...); void conf_die(bip_t *bip, char *fmt, ...);
static char *get_tuple_pvalue(list_t *tuple_l, int lex); static char *get_tuple_pvalue(list_t *tuple_l, int lex);
void bip_notify(struct link_client *ic, char *fmt, ...); void bip_notify(struct link_client *ic, char *fmt, ...);
void adm_list_connections(struct link_client *ic, struct user *bu); void adm_list_connections(struct link_client *ic, struct bipuser *bu);
void free_conf(list_t *l); void free_conf(list_t *l);
#ifdef HAVE_OIDENTD #ifdef HAVE_OIDENTD
@ -386,7 +386,7 @@ static int add_network(bip_t *bip, list_t *data)
void adm_bip_delconn(bip_t *bip, struct link_client *ic, const char *conn_name) void adm_bip_delconn(bip_t *bip, struct link_client *ic, const char *conn_name)
{ {
struct user *user = LINK(ic)->user; struct bipuser *user = LINK(ic)->user;
struct link *l; struct link *l;
if (!(l = hash_get(&user->connections, conn_name))) { if (!(l = hash_get(&user->connections, conn_name))) {
@ -401,7 +401,7 @@ void adm_bip_delconn(bip_t *bip, struct link_client *ic, const char *conn_name)
void adm_bip_addconn(bip_t *bip, struct link_client *ic, const char *conn_name, void adm_bip_addconn(bip_t *bip, struct link_client *ic, const char *conn_name,
const char *network_name) const char *network_name)
{ {
struct user *user = LINK(ic)->user; struct bipuser *user = LINK(ic)->user;
struct network *network; struct network *network;
/* check name uniqueness */ /* check name uniqueness */
@ -452,7 +452,7 @@ void adm_bip_addconn(bip_t *bip, struct link_client *ic, const char *conn_name,
bip_notify(ic, "connection added, you should soon be able to connect"); bip_notify(ic, "connection added, you should soon be able to connect");
} }
static int add_connection(bip_t *bip, struct user *user, list_t *data) static int add_connection(bip_t *bip, struct bipuser *user, list_t *data)
{ {
struct tuple *t, *t2; struct tuple *t, *t2;
struct link *l; struct link *l;
@ -663,7 +663,7 @@ static int add_user(bip_t *bip, list_t *data, struct historical_directives *hds)
{ {
int r; int r;
struct tuple *t; struct tuple *t;
struct user *u; struct bipuser *u;
char *name = get_tuple_pvalue(data, LEX_NAME); char *name = get_tuple_pvalue(data, LEX_NAME);
list_t connection_list, *cl; list_t connection_list, *cl;
@ -675,7 +675,7 @@ static int add_user(bip_t *bip, list_t *data, struct historical_directives *hds)
} }
u = hash_get(&bip->users, name); u = hash_get(&bip->users, name);
if (!u) { if (!u) {
u = bip_calloc(sizeof(struct user), 1); u = bip_calloc(sizeof(struct bipuser), 1);
hash_insert(&bip->users, name, u); hash_insert(&bip->users, name, u);
hash_init(&u->connections, HASH_NOCASE); hash_init(&u->connections, HASH_NOCASE);
u->admin = 0; u->admin = 0;
@ -809,7 +809,7 @@ static int validate_config(bip_t *bip)
{ {
/* nick username realname or default_{nick,username,realname} in user */ /* nick username realname or default_{nick,username,realname} in user */
hash_iterator_t it, sit, cit; hash_iterator_t it, sit, cit;
struct user *user; struct bipuser *user;
struct link *link; struct link *link;
struct chan_info *ci; struct chan_info *ci;
int r = 1; int r = 1;
@ -881,10 +881,10 @@ void clear_marks(bip_t *bip)
((struct link *)list_it_item(&lit))->in_use = 0; ((struct link *)list_it_item(&lit))->in_use = 0;
for (hash_it_init(&bip->users, &hit); hash_it_item(&hit); for (hash_it_init(&bip->users, &hit); hash_it_item(&hit);
hash_it_next(&hit)) hash_it_next(&hit))
((struct user *)hash_it_item(&hit))->in_use = 0; ((struct bipuser *)hash_it_item(&hit))->in_use = 0;
} }
void user_kill(bip_t *bip, struct user *user) void user_kill(bip_t *bip, struct bipuser *user)
{ {
(void)bip; (void)bip;
if (!hash_is_empty(&user->connections)) if (!hash_is_empty(&user->connections))
@ -920,7 +920,7 @@ void sweep(bip_t *bip)
} }
for (hash_it_init(&bip->users, &hit); hash_it_item(&hit); for (hash_it_init(&bip->users, &hit); hash_it_item(&hit);
hash_it_next(&hit)) { hash_it_next(&hit)) {
struct user *u = (struct user *)hash_it_item(&hit); struct bipuser *u = (struct bipuser *)hash_it_item(&hit);
if (!u->in_use) { if (!u->in_use) {
hash_it_remove(&hit); hash_it_remove(&hit);
user_kill(bip, u); user_kill(bip, u);
@ -1332,7 +1332,7 @@ int main(int argc, char **argv)
#define RET_STR_LEN 256 #define RET_STR_LEN 256
#define LINE_SIZE_LIM 70 #define LINE_SIZE_LIM 70
void adm_print_connection(struct link_client *ic, struct link *lnk, void adm_print_connection(struct link_client *ic, struct link *lnk,
struct user *bu) struct bipuser *bu)
{ {
hash_iterator_t lit; hash_iterator_t lit;
char buf[RET_STR_LEN + 1]; char buf[RET_STR_LEN + 1];
@ -1500,7 +1500,7 @@ void adm_list_all_connections(struct link_client *ic)
bip_notify(ic, "-- All connections"); bip_notify(ic, "-- All connections");
for (hash_it_init(&_bip->users, &it); hash_it_item(&it); for (hash_it_init(&_bip->users, &it); hash_it_item(&it);
hash_it_next(&it)) { hash_it_next(&it)) {
struct user *u = hash_it_item(&it); struct bipuser *u = hash_it_item(&it);
if (u) if (u)
adm_list_connections(ic, u); adm_list_connections(ic, u);
} }
@ -1511,7 +1511,7 @@ void adm_list_all_connections(struct link_client *ic)
void adm_info_user(struct link_client *ic, const char *name) void adm_info_user(struct link_client *ic, const char *name)
{ {
struct user *u; struct bipuser *u;
char buf[RET_STR_LEN + 1]; char buf[RET_STR_LEN + 1];
int t_written = 0; int t_written = 0;
@ -1575,7 +1575,7 @@ void adm_list_users(struct link_client *ic)
bip_notify(ic, "-- User list"); bip_notify(ic, "-- User list");
for (hash_it_init(&_bip->users, &it); hash_it_item(&it); for (hash_it_init(&_bip->users, &it); hash_it_item(&it);
hash_it_next(&it)) { hash_it_next(&it)) {
struct user *u = hash_it_item(&it); struct bipuser *u = hash_it_item(&it);
int first = 1; int first = 1;
int t_written = 0; int t_written = 0;
@ -1664,7 +1664,7 @@ noroom:
bip_notify(ic, "-- End of Network list"); bip_notify(ic, "-- End of Network list");
} }
void adm_list_connections(struct link_client *ic, struct user *bu) void adm_list_connections(struct link_client *ic, struct bipuser *bu)
{ {
hash_iterator_t it; hash_iterator_t it;
connection_t *c; connection_t *c;

4
src/irc.c
View File

@ -515,7 +515,7 @@ int irc_dispatch_server(bip_t *bip, struct link_server *server,
/* send join and related stuff to client */ /* send join and related stuff to client */
static void irc_send_join(struct link_client *ic, struct channel *chan) static void irc_send_join(struct link_client *ic, struct channel *chan)
{ {
struct user *user; struct bipuser *user;
char *ircmask; char *ircmask;
user = LINK(ic)->user; user = LINK(ic)->user;
@ -669,7 +669,7 @@ static void irc_cli_make_join(struct link_client *ic)
void irc_cli_backlog(struct link_client *ic, int hours) void irc_cli_backlog(struct link_client *ic, int hours)
{ {
struct user *user; struct bipuser *user;
user = LINK(ic)->user; user = LINK(ic)->user;
assert(user); assert(user);

4
src/irc.h
View File

@ -58,7 +58,7 @@ struct channel {
#define IRC_TYPE_LOGING_CLIENT (2) #define IRC_TYPE_LOGING_CLIENT (2)
#define IRC_TYPE_TRUST_CLIENT (3) #define IRC_TYPE_TRUST_CLIENT (3)
struct user { struct bipuser {
/** client connection static data **/ /** client connection static data **/
char *name; char *name;
@ -139,7 +139,7 @@ struct link {
hash_t chan_infos; /* channels we want */ hash_t chan_infos; /* channels we want */
list_t chan_infos_order; /* for order only */ list_t chan_infos_order; /* for order only */
struct user *user; struct bipuser *user;
/** server connection static data **/ /** server connection static data **/
/* server list */ /* server list */

2
src/log.c
View File

@ -1200,7 +1200,7 @@ void log_flush_all(void)
} }
} }
log_t *log_new(struct user *user, const char *network) log_t *log_new(struct bipuser *user, const char *network)
{ {
log_t *logdata; log_t *logdata;

4
src/log.h
View File

@ -59,10 +59,10 @@ typedef struct log
int backlogging; int backlogging;
int lastfile_seeked; int lastfile_seeked;
struct user *user; struct bipuser *user;
} log_t; } log_t;
log_t *log_new(struct user *user, const char *network); log_t *log_new(struct bipuser *user, const char *network);
void logdata_free(log_t *logdata); void logdata_free(log_t *logdata);
void log_join(log_t *logdata, const char *ircmask, const char *channel); void log_join(log_t *logdata, const char *ircmask, const char *channel);