[srvx-commits] CVS: services/src opserv.c,1.307,1.308 modcmd.h,1.13,1.14 log.h,1.19,1.20

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

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

Modified Files:
	opserv.c modcmd.h log.h 
Log Message:
Fix SourceForge bugs #684122, 690263, 692505, 696506, 708259, 721438,
724570, 726176 (include missing files)
in log.h, "#define log srvx_log" to avoid gcc-3.3 complaints


Index: opserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/opserv.c,v
retrieving revision 1.307
retrieving revision 1.308
diff -C2 -r1.307 -r1.308
*** opserv.c	24 Jan 2003 18:16:56 -0000	1.307
--- opserv.c	24 May 2003 17:02:20 -0000	1.308
***************
*** 3247,3251 ****
          return 0;
      }
!     if (!svccmd_can_invoke(user, opserv, subcmd, channel, 0, 0, 1)) return 0;
      if (!irccasecmp(argv[1], "print")) action = trace_print_func;
      else if (!irccasecmp(argv[1], "count")) action = trace_count_func;
--- 3247,3251 ----
          return 0;
      }
!     if (!svccmd_can_invoke(user, opserv, subcmd, channel, SVCCMD_NOISY)) return 0;
      if (!irccasecmp(argv[1], "print")) action = trace_print_func;
      else if (!irccasecmp(argv[1], "count")) action = trace_count_func;
***************
*** 3465,3469 ****
      sprintf(buf, "%s %s", argv[0], argv[0]);
      if ((subcmd = opserv_get_command(buf))
!         && !svccmd_can_invoke(user, cmd->parent->bot, subcmd, channel, 0, 0, 1)) {
          return 0;
      }
--- 3465,3469 ----
      sprintf(buf, "%s %s", argv[0], argv[0]);
      if ((subcmd = opserv_get_command(buf))
!         && !svccmd_can_invoke(user, cmd->parent->bot, subcmd, channel, SVCCMD_NOISY)) {
          return 0;
      }
***************
*** 3559,3563 ****
      sprintf(buf, "%s %s", argv[0], argv[0]);
      if ((subcmd = opserv_get_command(buf))
!         && !svccmd_can_invoke(user, cmd->parent->bot, subcmd, channel, 0, 0, 1)) {
          return 0;
      }
--- 3559,3563 ----
      sprintf(buf, "%s %s", argv[0], argv[0]);
      if ((subcmd = opserv_get_command(buf))
!         && !svccmd_can_invoke(user, cmd->parent->bot, subcmd, channel, SVCCMD_NOISY)) {
          return 0;
      }
***************
*** 3807,3811 ****
  	return 0;
      }
!     if (!svccmd_can_invoke(user, opserv, subcmd, channel, 0, 0, 1)) return 0;
      if (!opserv_add_user_alert(user, name, reaction, unsplit_string(argv + 3, argc - 3, NULL))) return 0;
      opserv_notice(user, OSMSG_ADDED_ALERT, name);
--- 3807,3811 ----
  	return 0;
      }
!     if (!svccmd_can_invoke(user, opserv, subcmd, channel, SVCCMD_NOISY)) return 0;
      if (!opserv_add_user_alert(user, name, reaction, unsplit_string(argv + 3, argc - 3, NULL))) return 0;
      opserv_notice(user, OSMSG_ADDED_ALERT, name);

Index: modcmd.h
===================================================================
RCS file: /cvsroot/srvx/services/src/modcmd.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** modcmd.h	29 Oct 2002 04:31:29 -0000	1.13
--- modcmd.h	24 May 2003 17:02:21 -0000	1.14
***************
*** 69,72 ****
--- 69,77 ----
  #define MODCMD_REQUIRE_STAFF          (MODCMD_REQUIRE_OPER|MODCMD_REQUIRE_NETWORK_HELPER|MODCMD_REQUIRE_SUPPORT_HELPER)
  
+ #define SVCCMD_QUALIFIED              0x000001
+ #define SVCCMD_DEBIT                  0x000002
+ #define SVCCMD_NOISY                  0x000004
+ #define SVCCMD_IN_CHANNEL             0x000008
+ 
  /* Modularized commands work like this:
   *
***************
*** 168,172 ****
   * 
   */
! int svccmd_can_invoke(struct userNode *user, struct userNode *bot, struct svccmd *cmd, struct chanNode *channel, char server_qualified, char debit, char noisy);
  /* Execute a command.  Returns non-zero on success. */
  int svccmd_invoke_argv(struct userNode *user, struct service *service, struct chanNode *channel, unsigned int argc, unsigned char *argv[], unsigned int server_qualified);
--- 173,177 ----
   * 
   */
! int svccmd_can_invoke(struct userNode *user, struct userNode *bot, struct svccmd *cmd, struct chanNode *channel, int flags);
  /* Execute a command.  Returns non-zero on success. */
  int svccmd_invoke_argv(struct userNode *user, struct service *service, struct chanNode *channel, unsigned int argc, unsigned char *argv[], unsigned int server_qualified);

Index: log.h
===================================================================
RCS file: /cvsroot/srvx/services/src/log.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** log.h	15 Aug 2002 03:50:09 -0000	1.19
--- log.h	24 May 2003 17:02:21 -0000	1.20
***************
*** 73,76 ****
--- 73,77 ----
  int init_logs(void);
  void reopen_logs(void);
+ #define log srvx_log
  void log(enum log_type lt, enum log_severity ls, char *format, ...);