[srvx-commits] CVS: services/src/srvx gline.c,1.1,1.2 gline.h,1.1,1.2 log.c,1.1,1.2 proto.c,1.1,1.2
Brought to you by:
entrope
Menu
▾
▴
[srvx-commits] CVS: services/src/srvx gline.c,1.1,1.2 gline.h,1.1,1.2 log.c,1.1,1.2 proto.c,1.1,1.2 service.c,1.1,1.2
|
From: Entrope <en...@us...> - 2001-10-22 13:50:49
|
Update of /cvsroot/srvx/services/src/srvx
In directory usw-pr-cvs1:/tmp/cvs-serv6098
Modified Files:
gline.c gline.h log.c proto.c service.c
Log Message:
consistently put service bot before user in argument lists
Index: gline.c
===================================================================
RCS file: /cvsroot/srvx/services/src/srvx/gline.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** gline.c 2001/10/20 18:47:05 1.1
--- gline.c 2001/10/22 13:50:45 1.2
***************
*** 272,276 ****
struct gline_discrim *
! gline_discrim_create(struct user *user, struct user *src, unsigned int argc, unsigned char *argv[])
{
unsigned int i;
--- 272,276 ----
struct gline_discrim *
! gline_discrim_create(struct user *bot, struct user *source, unsigned int argc, unsigned char *argv[])
{
unsigned int i;
***************
*** 278,282 ****
if (argc % 2) {
! send_message(user, src, MSG_MISSING_PARAMS, argv[argc-1]);
return NULL;
}
--- 278,282 ----
if (argc % 2) {
! send_message(bot, source, MSG_MISSING_PARAMS, argv[argc-1]);
return NULL;
}
***************
*** 289,293 ****
if (!strcasecmp(argv[i], "mask")) {
if (!is_gline(argv[++i])) {
! send_message(user, src, MSG_INVALID_GLINE, argv[i]);
goto fail;
}
--- 289,293 ----
if (!strcasecmp(argv[i], "mask")) {
if (!is_gline(argv[++i])) {
! send_message(bot, source, MSG_INVALID_GLINE, argv[i]);
goto fail;
}
***************
*** 302,306 ****
discrim->min_expire = now + ParseInterval(argv[++i]);
} else {
! send_message(user, src, MSG_INVALID_CRITERIA, argv[i]);
goto fail;
}
--- 302,306 ----
discrim->min_expire = now + ParseInterval(argv[++i]);
} else {
! send_message(bot, source, MSG_INVALID_CRITERIA, argv[i]);
goto fail;
}
Index: gline.h
===================================================================
RCS file: /cvsroot/srvx/services/src/srvx/gline.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** gline.h 2001/10/20 18:47:05 1.1
--- gline.h 2001/10/22 13:50:45 1.2
***************
*** 45,49 ****
typedef void (*gline_search_func)(struct gline *gline, void *extra);
! struct gline_discrim *gline_discrim_create(struct user *user, struct user *src, unsigned int argc, unsigned char *argv[]);
unsigned int gline_discrim_search(struct gline_discrim *discrim, gline_search_func gsf, void *data);
--- 45,49 ----
typedef void (*gline_search_func)(struct gline *gline, void *extra);
! struct gline_discrim *gline_discrim_create(struct user *bot, struct user *source, unsigned int argc, unsigned char *argv[]);
unsigned int gline_discrim_search(struct gline_discrim *discrim, gline_search_func gsf, void *data);
Index: log.c
===================================================================
RCS file: /cvsroot/srvx/services/src/srvx/log.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** log.c 2001/10/20 18:47:05 1.1
--- log.c 2001/10/22 13:50:45 1.2
***************
*** 198,202 ****
if((argc - 1) % 2)
{
! send_message(user, service, MSG_MISSING_PARAMS, argv[0]);
return NULL;
}
--- 198,202 ----
if((argc - 1) % 2)
{
! send_message(service, user, MSG_MISSING_PARAMS, argv[0]);
return NULL;
}
***************
*** 210,214 ****
discrim->severity = find_severity(argv[i], strlen(argv[i]));
if (discrim->severity == LOG_NUM_SEVERITIES) {
! send_message(user, service, MSG_INVALID_SEVERITY, argv[i]);
goto fail;
}
--- 210,214 ----
discrim->severity = find_severity(argv[i], strlen(argv[i]));
if (discrim->severity == LOG_NUM_SEVERITIES) {
! send_message(service, user, MSG_INVALID_SEVERITY, argv[i]);
goto fail;
}
***************
*** 216,220 ****
discrim->type = find_log_type(argv[++i]);
if (discrim->type == NUM_LOGS) {
! send_message(user, service, MSG_INVALID_TYPE, argv[i]);
goto fail;
}
--- 216,220 ----
discrim->type = find_log_type(argv[++i]);
if (discrim->type == NUM_LOGS) {
! send_message(service, user, MSG_INVALID_TYPE, argv[i]);
goto fail;
}
***************
*** 224,228 ****
discrim->limit = strtoul(argv[++i], NULL, 10);
} else {
! send_message(user, service, MSG_INVALID_CRITERIA, argv[i]);
goto fail;
}
--- 224,228 ----
discrim->limit = strtoul(argv[++i], NULL, 10);
} else {
! send_message(service, user, MSG_INVALID_CRITERIA, argv[i]);
goto fail;
}
Index: proto.c
===================================================================
RCS file: /cvsroot/srvx/services/src/srvx/proto.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** proto.c 2001/10/20 18:47:05 1.1
--- proto.c 2001/10/22 13:50:45 1.2
***************
*** 350,354 ****
static void
! vsend_message(const char *dest, struct user *src, int use_privmsg, expand_func_t expand, const char *format, va_list al)
{
void (*irc_send)(struct user *from, const char *to, const char *msg);
--- 350,354 ----
static void
! vsend_message(struct user *src, const char *dest, int use_privmsg, expand_func_t expand, const char *format, va_list al)
{
void (*irc_send)(struct user *from, const char *to, const char *msg);
***************
*** 523,532 ****
void
! send_message(struct user *dest, struct user *src, const char *format, ...)
{
va_list ap;
va_start(ap, format);
! vsend_message(dest->nick, src, 0, NULL, format, ap);
va_end(ap);
}
--- 523,532 ----
void
! send_message(struct user *src, struct user *dest, const char *format, ...)
{
va_list ap;
va_start(ap, format);
! vsend_message(src, dest->nick, 0, NULL, format, ap);
va_end(ap);
}
Index: service.c
===================================================================
RCS file: /cvsroot/srvx/services/src/srvx/service.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** service.c 2001/10/20 18:47:05 1.1
--- service.c 2001/10/22 13:50:45 1.2
***************
*** 111,115 ****
chan_name = argv[0];
} else {
! send_message(source, bot, MSG_INVALID_CHANNEL);
return;
}
--- 111,115 ----
chan_name = argv[0];
} else {
! send_message(bot, source, MSG_INVALID_CHANNEL);
return;
}
***************
*** 129,133 ****
}
if ((cmd->base->flags & (1 << REQUIRE_AUTHED)) && !source->handle_info) {
! send_message(source, bot, N_("You must authenticate yourself first."));
return;
}
--- 129,133 ----
}
if ((cmd->base->flags & (1 << REQUIRE_AUTHED)) && !source->handle_info) {
! send_message(bot, source, N_("You must authenticate yourself first."));
return;
}
***************
*** 136,140 ****
}
if ((cmd->base->flags & (1 << REQUIRE_CHANNEL)) && !chan) {
! send_message(source, bot, MSG_INVALID_CHANNEL);
return;
}
--- 136,140 ----
}
if ((cmd->base->flags & (1 << REQUIRE_CHANNEL)) && !chan) {
! send_message(bot, source, MSG_INVALID_CHANNEL);
return;
}
***************
*** 143,150 ****
rule_ctx.channel = chan;
if (!expression_evaluate(cmd->rule ? cmd->rule : cmd->base->default_rule, &rule_ctx)) {
! send_message(source, bot, N_("Access to $b%s$b denied."), argv[shift]);
return;
}
! cmd->base->function(source, bot, chan, argc-shift, argv+shift);
}
--- 143,150 ----
rule_ctx.channel = chan;
if (!expression_evaluate(cmd->rule ? cmd->rule : cmd->base->default_rule, &rule_ctx)) {
! send_message(bot, source, N_("Access to $b%s$b denied."), argv[shift]);
return;
}
! cmd->base->function(bot, source, chan, argc-shift, argv+shift);
}
|
