[srvx-commits] CVS: services/src chanserv.c,1.370,1.371 global.c,1.56,1.57 helpserv.c,1.73,1.74 log.c,1.63,1.64 log.h,1.26,1.27 main.c,1.151,1.152 nickserv.c,1.245,1.246 opserv.c,1.329,1.330 sockcheck.c,1.90,1.91

[Entrope <en...@us...>]

Update of /cvsroot/srvx/services/src
In directory sc8-pr-cvs1:/tmp/cvs-serv20352/src

Modified Files:
	chanserv.c global.c helpserv.c log.c log.h main.c nickserv.c 
	opserv.c sockcheck.c 
Log Message:
remove the essentially pointless "bot" argument to log_register_type()


Index: chanserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/chanserv.c,v
retrieving revision 1.370
retrieving revision 1.371
diff -C2 -r1.370 -r1.371
*** chanserv.c	25 Jul 2003 04:50:16 -0000	1.370
--- chanserv.c	31 Jul 2003 02:08:40 -0000	1.371
***************
*** 7186,7190 ****
  {
      chanserv = AddService(nick, "Channel Services");
!     CS_LOG = log_register_type("ChanServ", chanserv, "file:chanserv.log");
      conf_register_reload(chanserv_conf_read);
  
--- 7186,7190 ----
  {
      chanserv = AddService(nick, "Channel Services");
!     CS_LOG = log_register_type("ChanServ", "file:chanserv.log");
      conf_register_reload(chanserv_conf_read);
  

Index: global.c
===================================================================
RCS file: /cvsroot/srvx/services/src/global.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -r1.56 -r1.57
*** global.c	22 Jul 2003 18:32:19 -0000	1.56
--- global.c	31 Jul 2003 02:08:40 -0000	1.57
***************
*** 698,702 ****
  {
      global = AddService(nick, "Global Services");
!     G_LOG = log_register_type("Global", global, "file:global.log");
      reg_new_user_func(global_process_user);
      reg_auth_func(global_process_auth);
--- 698,702 ----
  {
      global = AddService(nick, "Global Services");
!     G_LOG = log_register_type("Global", "file:global.log");
      reg_new_user_func(global_process_user);
      reg_auth_func(global_process_auth);

Index: helpserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/helpserv.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -r1.73 -r1.74
*** helpserv.c	22 Jul 2003 18:32:20 -0000	1.73
--- helpserv.c	31 Jul 2003 02:08:40 -0000	1.74
***************
*** 4075,4079 ****
      helpserv_enabled = 1;
  
!     HS_LOG = log_register_type("HelpServ", NULL, "file:helpserv.log");
      conf_register_reload(helpserv_conf_read);
  
--- 4075,4079 ----
      helpserv_enabled = 1;
  
!     HS_LOG = log_register_type("HelpServ", "file:helpserv.log");
      conf_register_reload(helpserv_conf_read);
  

Index: log.c
===================================================================
RCS file: /cvsroot/srvx/services/src/log.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -r1.63 -r1.64
*** log.c	23 Jul 2003 00:01:31 -0000	1.63
--- log.c	31 Jul 2003 02:08:40 -0000	1.64
***************
*** 46,50 ****
  struct log_type {
      char *name;
-     struct userNode *bot;
      struct logList logs[LOG_NUM_SEVERITIES];
      struct logEntry *log_oldest;
--- 46,49 ----
***************
*** 358,362 ****
                  logList_open(&logList, iter_data(it));
                  for (ii = 0; ii < slist->used; ++ii) {
!                     type = log_register_type(slist->list[ii], NULL, NULL);
                      for (sev = 0; sev < LOG_NUM_SEVERITIES; ++sev) {
                          if (!sevset[sev]) continue;
--- 357,361 ----
                  logList_open(&logList, iter_data(it));
                  for (ii = 0; ii < slist->used; ++ii) {
!                     type = log_register_type(slist->list[ii], NULL);
                      for (sev = 0; sev < LOG_NUM_SEVERITIES; ++sev) {
                          if (!sevset[sev]) continue;
***************
*** 368,372 ****
              } else if ((rd2 = iter_data(it))
                         && (rd2->type == RECDB_OBJECT)
!                        && (type = log_register_type(iter_key(it), NULL, NULL))) {
                  log_parse_options(type, rd2->d.object);
              } else {
--- 367,371 ----
              } else if ((rd2 = iter_data(it))
                         && (rd2->type == RECDB_OBJECT)
!                        && (type = log_register_type(iter_key(it), NULL))) {
                  log_parse_options(type, rd2->d.object);
              } else {
***************
*** 406,410 ****
  
  struct log_type *
! log_register_type(const char *name, struct userNode *bot, const char *default_log)
  {
      struct log_type *type;
--- 405,409 ----
  
  struct log_type *
! log_register_type(const char *name, const char *default_log)
  {
      struct log_type *type;
***************
*** 419,423 ****
          dict_insert(log_types, type->name, type);
      }
-     if (bot && !type->bot) type->bot = bot;
      if (default_log && !type->default_set) {
          /* If any severity level was unspecified in the config, use the default. */
--- 418,421 ----
***************
*** 969,975 ****
      struct logDest_irc *self = (struct logDest_irc*)self_;
      extern struct userNode *opserv;
-     struct userNode *bot = type->bot ? type->bot : opserv;
  
!     send_target_message(0, self->target, bot, "%s %s: %s\n", type->name, log_severity_names[sev], message);
  }
  
--- 967,972 ----
      struct logDest_irc *self = (struct logDest_irc*)self_;
      extern struct userNode *opserv;
  
!     send_target_message(0, self->target, opserv, "%s %s: %s\n", type->name, log_severity_names[sev], message);
  }
  
***************
*** 996,1000 ****
      dict_insert(log_dest_types, ldIrc_vtbl.type_name, &ldIrc_vtbl);
      conf_register_reload(log_conf_read);
!     log_default = log_register_type("*", NULL, NULL);
      reg_exit_func(cleanup_logs);
      log_inited = 1;
--- 993,997 ----
      dict_insert(log_dest_types, ldIrc_vtbl.type_name, &ldIrc_vtbl);
      conf_register_reload(log_conf_read);
!     log_default = log_register_type("*", NULL);
      reg_exit_func(cleanup_logs);
      log_inited = 1;

Index: log.h
===================================================================
RCS file: /cvsroot/srvx/services/src/log.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** log.h	15 Jul 2003 21:25:45 -0000	1.26
--- log.h	31 Jul 2003 02:08:40 -0000	1.27
***************
*** 46,50 ****
  #define AUDIT_HOSTMASK  0x01
  
! struct log_type *log_register_type(const char *name, struct userNode *bot, const char *default_log);
  /* constraint for log_audit: sev one of LOG_COMMAND, LOG_OVERRIDE, LOG_STAFF */
  void log_audit(struct log_type *type, enum log_severity sev, struct userNode *user, struct userNode *bot, const char *channel_name, unsigned int flags, const char *command);
--- 46,50 ----
  #define AUDIT_HOSTMASK  0x01
  
! struct log_type *log_register_type(const char *name, const char *default_log);
  /* constraint for log_audit: sev one of LOG_COMMAND, LOG_OVERRIDE, LOG_STAFF */
  void log_audit(struct log_type *type, enum log_severity sev, struct userNode *user, struct userNode *bot, const char *channel_name, unsigned int flags, const char *command);

Index: main.c
===================================================================
RCS file: /cvsroot/srvx/services/src/main.c,v
retrieving revision 1.151
retrieving revision 1.152
diff -C2 -r1.151 -r1.152
*** main.c	22 Jul 2003 18:32:20 -0000	1.151
--- main.c	31 Jul 2003 02:08:40 -0000	1.152
***************
*** 762,766 ****
  
      log_init();
!     MAIN_LOG = log_register_type("srvx", NULL, "file:main.log");
      if (debug) {
          log_debug();
--- 762,766 ----
  
      log_init();
!     MAIN_LOG = log_register_type("srvx", "file:main.log");
      if (debug) {
          log_debug();

Index: nickserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/nickserv.c,v
retrieving revision 1.245
retrieving revision 1.246
diff -C2 -r1.245 -r1.246
*** nickserv.c	29 Jul 2003 01:50:08 -0000	1.245
--- nickserv.c	31 Jul 2003 02:08:40 -0000	1.246
***************
*** 3352,3356 ****
      unsigned int i;
      nickserv = AddService(nick, "Nick Services");
!     NS_LOG = log_register_type("NickServ", nickserv, "file:nickserv.log");
      reg_new_user_func(handle_new_user);
      reg_nick_change_func(handle_nick_change);
--- 3352,3356 ----
      unsigned int i;
      nickserv = AddService(nick, "Nick Services");
!     NS_LOG = log_register_type("NickServ", "file:nickserv.log");
      reg_new_user_func(handle_new_user);
      reg_nick_change_func(handle_nick_change);

Index: opserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/opserv.c,v
retrieving revision 1.329
retrieving revision 1.330
diff -C2 -r1.329 -r1.330
*** opserv.c	26 Jul 2003 04:12:20 -0000	1.329
--- opserv.c	31 Jul 2003 02:08:40 -0000	1.330
***************
*** 3883,3887 ****
  {
      opserv = AddService(nick, "Oper Services");
!     OS_LOG = log_register_type("OpServ", opserv, "file:opserv.log");
      conf_register_reload(opserv_conf_read);
  
--- 3883,3887 ----
  {
      opserv = AddService(nick, "Oper Services");
!     OS_LOG = log_register_type("OpServ", "file:opserv.log");
      conf_register_reload(opserv_conf_read);
  

Index: sockcheck.c
===================================================================
RCS file: /cvsroot/srvx/services/src/sockcheck.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -C2 -r1.90 -r1.91
*** sockcheck.c	22 Jul 2003 18:32:20 -0000	1.90
--- sockcheck.c	31 Jul 2003 02:08:40 -0000	1.91
***************
*** 1165,1169 ****
  sockcheck_init(void)
  {
!     PC_LOG = log_register_type("ProxyCheck", NULL, "file:proxycheck.log");
      conf_register_reload(sockcheck_read_conf);
      reg_exit_func(sockcheck_shutdown);
--- 1165,1169 ----
  sockcheck_init(void)
  {
!     PC_LOG = log_register_type("ProxyCheck", "file:proxycheck.log");
      conf_register_reload(sockcheck_read_conf);
      reg_exit_func(sockcheck_shutdown);