[srvx-commits] CVS: services/src global.c,1.55,1.56 globtest.c,1.7,1.8 helpserv.c,1.72,1.73 log.c,1.61,1.62 main.c,1.150,1.151 mod-snoop.c,1.12,1.13 nickserv.c,1.242,1.243 opserv.c,1.327,1.328 proto-bahamut.c,1.39,1.40 proto-common.c,1.31,1.32 proto-p10.c,1.69,1.70 saxdb.c,1.29,1.30 sendmail.c,1.12,1.13 sockcheck.c,1.89,1.90

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

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

Modified Files:
	global.c globtest.c helpserv.c log.c main.c mod-snoop.c 
	nickserv.c opserv.c proto-bahamut.c proto-common.c proto-p10.c 
	saxdb.c sendmail.c sockcheck.c 
Log Message:
further use UNUSED_ARG() instead of (void)argname;


Index: global.c
===================================================================
RCS file: /cvsroot/srvx/services/src/global.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -r1.55 -r1.56
*** global.c	7 Jul 2003 16:29:33 -0000	1.55
--- global.c	22 Jul 2003 18:32:19 -0000	1.56
***************
*** 434,438 ****
      struct helpfile_table table;
      unsigned int length, nn;
-     (void)argc; (void)argv;
  
      if(!messageList)
--- 434,437 ----
***************
*** 542,546 ****
      long mask = MESSAGE_RECIPIENT_LUSERS | MESSAGE_RECIPIENT_CHANNELS;
      unsigned int count;
-     (void)argc;(void)argv;
  
      if(IsOper(user))
--- 541,544 ----
***************
*** 569,577 ****
  static GLOBAL_FUNC(cmd_version)
  {
-     (void)argc;(void)argv;
- 
      global_notice(user, MSG_VERSION);
      global_notice(user, GMSG_VERSION_ID);
- 
      return 1;
  }
--- 567,572 ----
***************
*** 602,608 ****
  
  static void
! global_process_auth(struct userNode *user, struct handle_info *old_handle)
  {
-     (void)old_handle;
      if(IsHelper(user))
      {
--- 597,602 ----
  
  static void
! global_process_auth(struct userNode *user, UNUSED_ARG(struct handle_info *old_handle))
  {
      if(IsHelper(user))
      {

Index: globtest.c
===================================================================
RCS file: /cvsroot/srvx/services/src/globtest.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** globtest.c	21 Jul 2003 21:52:52 -0000	1.7
--- globtest.c	22 Jul 2003 18:32:20 -0000	1.8
***************
*** 39,48 ****
  
  int
! main(int argc, char *argv[])
  {
      int i, j;
  
-     (void)argc; (void)argv;
- 
      for (i = 0; glob_yes[i].glob; i++) {
  	for (j=0; glob_yes[i].texts[j]; j++) {
--- 39,46 ----
  
  int
! main(UNUSED_ARG(int argc), UNUSED_ARG(char *argv[]))
  {
      int i, j;
  
      for (i = 0; glob_yes[i].glob; i++) {
  	for (j=0; glob_yes[i].texts[j]; j++) {
***************
*** 75,82 ****
  
  /* because tools.c likes to log stuff.. */
! void log(enum log_type lt, enum log_severity ls, char *format, ...)
  {
      va_list va;
-     (void)lt; (void)ls;
      va_start(va, format);
      vfprintf(stderr, format, va);
--- 73,79 ----
  
  /* because tools.c likes to log stuff.. */
! void log(UNUSED_ARG(enum log_type lt), UNUSED_ARG(enum log_severity ls), char *format, ...)
  {
      va_list va;
      va_start(va, format);
      vfprintf(stderr, format, va);

Index: helpserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/helpserv.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -r1.72 -r1.73
*** helpserv.c	15 Jul 2003 21:25:45 -0000	1.72
--- helpserv.c	22 Jul 2003 18:32:20 -0000	1.73
***************
*** 515,519 ****
  
  #define HELPSERV_SYNTAX() helpserv_help(hs, from_opserv, user, argv[0])
! #define HELPSERV_FUNC(NAME) int NAME(struct userNode *user, struct helpserv_bot *hs, int from_opserv, unsigned int argc, unsigned char *argv[])
  typedef HELPSERV_FUNC(helpserv_func_t);
  #define HELPSERV_OPTION(NAME) HELPSERV_FUNC(NAME)
--- 515,519 ----
  
  #define HELPSERV_SYNTAX() helpserv_help(hs, from_opserv, user, argv[0])
! #define HELPSERV_FUNC(NAME) int NAME(struct userNode *user, UNUSED_ARG(struct helpserv_bot *hs), int from_opserv, UNUSED_ARG(unsigned int argc), UNUSED_ARG(unsigned char *argv[]))
  typedef HELPSERV_FUNC(helpserv_func_t);
  #define HELPSERV_OPTION(NAME) HELPSERV_FUNC(NAME)
***************
*** 917,921 ****
  
  /* Handle messages direct to a HelpServ bot. */
! static void helpserv_botmsg(struct userNode *user, struct userNode *target, char *text, int server_qualified) {
      struct helpserv_bot *hs;
      struct helpserv_cmd *cmd;
--- 917,921 ----
  
  /* Handle messages direct to a HelpServ bot. */
! static void helpserv_botmsg(struct userNode *user, struct userNode *target, char *text, UNUSED_ARG(int server_qualified)) {
      struct helpserv_bot *hs;
      struct helpserv_cmd *cmd;
***************
*** 925,930 ****
      const int from_opserv = 0; /* for helpserv_notice */
  
-     (void)server_qualified;
- 
      /* Ignore things consisting of empty lines */
      if (!*text) return;
--- 925,928 ----
***************
*** 1021,1026 ****
  
  static HELPSERV_FUNC(cmd_version) {
-     (void)hs;
- 
      helpserv_notice(user, MSG_VERSION);
  
--- 1019,1022 ----
***************
*** 1036,1044 ****
  }
  
! static int append_entry(const char *key, void *data, void *extra) {
      struct helpfile_expansion *exp = extra;
      int row;
  
-     (void)data;
      row = exp->value.table.length++;
      exp->value.table.contents[row] = calloc(1, sizeof(char*));
--- 1032,1039 ----
  }
  
! static int append_entry(const char *key, UNUSED_ARG(void *data), void *extra) {
      struct helpfile_expansion *exp = extra;
      int row;
  
      row = exp->value.table.length++;
      exp->value.table.contents[row] = calloc(1, sizeof(char*));
***************
*** 1088,1093 ****
      struct helpfile *old_helpfile = helpserv_helpfile;
  
-     (void)argc; (void)argv; (void)hs; /* ignore them! ignore them all! */
- 
      gettimeofday(&start, NULL);
      helpserv_helpfile_read();
--- 1083,1086 ----
***************
*** 1215,1220 ****
      const enum helpserv_level lvl_lowest=HlTrial, lvl_highest=HlOwner;
  
-     (void)argc; (void)argv;
- 
      helpserv_notice(user, HSMSG_USERLIST_HEADER, hs->helpserv->nick);
      if (dict_size(hs->users) == 0) {
--- 1208,1211 ----
***************
*** 1675,1680 ****
      struct helpserv_request *req;
  
-     (void)argc; (void)argv;
- 
      if (!(req = hs->unhandled)) {
          helpserv_notice(user, HSMSG_REQ_NO_UNASSIGNED);
--- 1666,1669 ----
***************
*** 2088,2093 ****
      unsigned int i;
  
-     (void)argc; (void)argv;
- 
      helpserv_notice(user, HSMSG_BOTLIST_HEADER);
  
--- 2077,2080 ----
***************
*** 3158,3162 ****
  }
  
! static int helpserv_bot_read(const char *key, void *data, void *extra) {
      struct record_data *br = data, *raw_record;
      struct helpserv_bot *hs;
--- 3145,3149 ----
  }
  
! static int helpserv_bot_read(const char *key, void *data, UNUSED_ARG(void *extra)) {
      struct record_data *br = data, *raw_record;
      struct helpserv_bot *hs;
***************
*** 3168,3173 ****
      enum persistence_type persisttype;
  
-     (void)extra;
- 
      users = database_get_data(GET_RECORD_OBJECT(br), KEY_HELPERS, RECDB_OBJECT);
      if (!users) {
--- 3155,3158 ----
***************
*** 3331,3335 ****
  
  /* Drop requests that persist until part when a user leaves the chan */
! static void handle_part(struct userNode *user, struct chanNode *chan, const char *reason) {
      struct helpserv_botlist *botlist;
      struct helpserv_userlist *userlist;
--- 3316,3320 ----
  
  /* Drop requests that persist until part when a user leaves the chan */
! static void handle_part(struct userNode *user, struct chanNode *chan, UNUSED_ARG(const char *reason)) {
      struct helpserv_botlist *botlist;
      struct helpserv_userlist *userlist;
***************
*** 3337,3341 ****
      unsigned int i;
  
-     (void)reason;
      if ((botlist = dict_find(helpserv_bots_bychan_dict, chan->name, NULL))) {
          for (i=0; i < botlist->used; i++) {
--- 3322,3325 ----
***************
*** 3421,3430 ****
   * Unassign requests where req->helper persists until the helper parts or
   * quits. */
! static void handle_quit(struct userNode *user, struct userNode *killer, const char *why) {
      struct helpserv_reqlist *reqlist;
      struct helpserv_userlist *userlist;
      unsigned int i, n;
  
-     (void)killer; (void)why;
      if (IsLocal(user)) {
          struct helpserv_bot *hs;
--- 3405,3413 ----
   * Unassign requests where req->helper persists until the helper parts or
   * quits. */
! static void handle_quit(struct userNode *user, UNUSED_ARG(struct userNode *killer), UNUSED_ARG(const char *why)) {
      struct helpserv_reqlist *reqlist;
      struct helpserv_userlist *userlist;
      unsigned int i, n;
  
      if (IsLocal(user)) {
          struct helpserv_bot *hs;
***************
*** 4028,4038 ****
  
  /* If data != NULL, then don't add to the timeq */
! static void helpserv_run_stats(void *data) {
      struct helpserv_bot *hs;
      struct helpserv_user *hs_user;
      int i;
      dict_iterator_t it, it2;
- 
-     (void)data;
  
      for (it=dict_first(helpserv_bots_dict); it; it=iter_next(it)) {
--- 4011,4019 ----
  
  /* If data != NULL, then don't add to the timeq */
! static void helpserv_run_stats(UNUSED_ARG(void *data)) {
      struct helpserv_bot *hs;
      struct helpserv_user *hs_user;
      int i;
      dict_iterator_t it, it2;
  
      for (it=dict_first(helpserv_bots_dict); it; it=iter_next(it)) {

Index: log.c
===================================================================
RCS file: /cvsroot/srvx/services/src/log.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -r1.61 -r1.62
*** log.c	15 Jul 2003 21:25:45 -0000	1.61
--- log.c	22 Jul 2003 18:32:20 -0000	1.62
***************
*** 777,787 ****
  
  static void
! ldNop_reopen(struct logDestination *self_) {
!     (void)self_; /* no operation necessary */
  }
  
  static void
! ldNop_replay(struct logDestination *self_, struct log_type *type, int is_write, const char *line) {
!     (void)self_; (void)type; (void)is_write; (void)line; /* no operation necessary */
  }
  
--- 777,787 ----
  
  static void
! ldNop_reopen(UNUSED_ARG(struct logDestination *self_)) {
!     /* no operation necessary */
  }
  
  static void
! ldNop_replay(UNUSED_ARG(struct logDestination *self_), UNUSED_ARG(struct log_type *type), UNUSED_ARG(int is_write), UNUSED_ARG(const char *line)) {
!     /* no operation necessary */
  }
  
***************
*** 821,834 ****
  
  static void
! ldFile_audit(struct logDestination *self_, struct log_type *type, struct logEntry *entry) {
      struct logDest_file *self = (struct logDest_file*)self_;
      fputs(entry->default_desc, self->output);
      fputc('\n', self->output);
      fflush(self->output);
-     (void)type;
  }
  
  static void
! ldFile_replay(struct logDestination *self_, struct log_type *type, int is_write, const char *line) {
      struct logDest_file *self = (struct logDest_file*)self_;
      struct string_buffer sbuf;
--- 821,833 ----
  
  static void
! ldFile_audit(struct logDestination *self_, UNUSED_ARG(struct log_type *type), struct logEntry *entry) {
      struct logDest_file *self = (struct logDest_file*)self_;
      fputs(entry->default_desc, self->output);
      fputc('\n', self->output);
      fflush(self->output);
  }
  
  static void
! ldFile_replay(struct logDestination *self_, UNUSED_ARG(struct log_type *type), int is_write, const char *line) {
      struct logDest_file *self = (struct logDest_file*)self_;
      struct string_buffer sbuf;
***************
*** 841,845 ****
      free(sbuf.list);
      fflush(self->output);
-     (void)type;
  }
  
--- 840,843 ----
***************
*** 896,911 ****
  
  static void
! ldStd_replay(struct logDestination *self_, struct log_type *type, int is_write, const char *line) {
      struct logDest_file *self = (struct logDest_file*)self_;
-     (void)type;
- 
      fprintf(self->output, "%s%s\n", is_write ? "W: " : "   ", line);
  }
  
  static void
! ldStd_module(struct logDestination *self_, struct log_type *type, enum log_severity sev, const char *message) {
      struct logDest_file *self = (struct logDest_file*)self_;
-     (void)type;
- 
      fprintf(self->output, "%s: %s\n", log_severity_names[sev], message);
  }
--- 894,905 ----
  
  static void
! ldStd_replay(struct logDestination *self_, UNUSED_ARG(struct log_type *type), int is_write, const char *line) {
      struct logDest_file *self = (struct logDest_file*)self_;
      fprintf(self->output, "%s%s\n", is_write ? "W: " : "   ", line);
  }
  
  static void
! ldStd_module(struct logDestination *self_, UNUSED_ARG(struct log_type *type), enum log_severity sev, const char *message) {
      struct logDest_file *self = (struct logDest_file*)self_;
      fprintf(self->output, "%s: %s\n", log_severity_names[sev], message);
  }
***************
*** 946,950 ****
  
  static void
! ldIrc_audit(struct logDestination *self_, struct log_type *type, struct logEntry *entry) {
      struct logDest_irc *self = (struct logDest_irc*)self_;
  
--- 940,944 ----
  
  static void
! ldIrc_audit(struct logDestination *self_, UNUSED_ARG(struct log_type *type), struct logEntry *entry) {
      struct logDest_irc *self = (struct logDest_irc*)self_;
  
***************
*** 954,958 ****
          send_target_message(0, self->target, entry->bot, "%s", strchr(entry->default_desc, ')')+2);
      }
-     (void)type;
  }
  
--- 948,951 ----

Index: main.c
===================================================================
RCS file: /cvsroot/srvx/services/src/main.c,v
retrieving revision 1.150
retrieving revision 1.151
diff -C2 -r1.150 -r1.151
*** main.c	22 Jul 2003 16:31:30 -0000	1.150
--- main.c	22 Jul 2003 18:32:20 -0000	1.151
***************
*** 79,83 ****
  
  static int
! uplink_insert(const char *key, void *data, void *extra)
  {
      struct uplinkNode *uplink = malloc(sizeof(struct uplinkNode));
--- 79,83 ----
  
  static int
! uplink_insert(const char *key, void *data, UNUSED_ARG(void *extra))
  {
      struct uplinkNode *uplink = malloc(sizeof(struct uplinkNode));
***************
*** 87,91 ****
      struct sockaddr_in *sin;
      unsigned long addr;
-     (void)extra;
  
      if(!uplink)
--- 87,90 ----
***************
*** 397,404 ****
  }
  
! void sigaction_wait(int x)
  {
      int code;
-     (void)x;
      waitpid(-1, &code, WNOHANG);
  }
--- 396,402 ----
  }
  
! void sigaction_wait(UNUSED_ARG(int x))
  {
      int code;
      waitpid(-1, &code, WNOHANG);
  }

Index: mod-snoop.c
===================================================================
RCS file: /cvsroot/srvx/services/src/mod-snoop.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** mod-snoop.c	7 Jul 2003 16:29:33 -0000	1.12
--- mod-snoop.c	22 Jul 2003 18:32:20 -0000	1.13
***************
*** 108,113 ****
  
  static void
! snoop_auth(struct userNode *user, struct handle_info *old_handle) {
!     (void)old_handle;
      if (!snoop_cfg.enabled) return;
      if (user->uplink->burst && !snoop_cfg.show_bursts) return;
--- 108,112 ----
  
  static void
! snoop_auth(struct userNode *user, UNUSED_ARG(struct handle_info *old_handle)) {
      if (!snoop_cfg.enabled) return;
      if (user->uplink->burst && !snoop_cfg.show_bursts) return;

Index: nickserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/nickserv.c,v
retrieving revision 1.242
retrieving revision 1.243
diff -C2 -r1.242 -r1.243
*** nickserv.c	8 Jul 2003 14:37:33 -0000	1.242
--- nickserv.c	22 Jul 2003 18:32:20 -0000	1.243
***************
*** 238,242 ****
  
  #define NICKSERV_FUNC(NAME) MODCMD_FUNC(NAME)
! #define OPTION_FUNC(NAME) int NAME(struct userNode *user, struct handle_info *hi, unsigned int override, unsigned int argc, unsigned char *argv[])
  typedef OPTION_FUNC(option_func_t);
  
--- 238,242 ----
  
  #define NICKSERV_FUNC(NAME) MODCMD_FUNC(NAME)
! #define OPTION_FUNC(NAME) int NAME(struct userNode *user, struct handle_info *hi, UNUSED_ARG(unsigned int override), unsigned int argc, unsigned char *argv[])
  typedef OPTION_FUNC(option_func_t);
  
***************
*** 245,249 ****
  #define NICKSERV_SYNTAX()	svccmd_send_help(user, nickserv, cmd)
  #define NICKSERV_MIN_PARMS(N) do { \
-   (void)argv; \
    if (argc < N) { \
      nickserv_notice(user, MSG_MISSING_PARAMS, argv[0]); \
--- 245,248 ----
***************
*** 332,336 ****
  
  static struct handle_info *
! register_handle(const char *handle, const char *passwd, unsigned long int id)
  {
      struct handle_info *hi;
--- 331,335 ----
  
  static struct handle_info *
! register_handle(const char *handle, const char *passwd, UNUSED_ARG(unsigned long id))
  {
      struct handle_info *hi;
***************
*** 360,365 ****
          }
      } while(!id);
- #else
-     (void)id;
  #endif
  
--- 359,362 ----
***************
*** 1566,1570 ****
      struct handle_info *hi;
  
-     (void)argc; (void)argv;
      hi = user->handle_info;
      if (hi->cookie) {
--- 1563,1566 ----
***************
*** 1708,1712 ****
      struct nick_info *ni;
  
-     (void)argv;
      if (!is_registerable_nick(user->nick)) {
          nickserv_notice(user, NSMSG_BAD_NICK, user->nick);
--- 1704,1707 ----
***************
*** 1955,1960 ****
  static OPTION_FUNC(opt_info)
  {
-     (void)override;
- 
      if (argc > 1) {
  	if ((argv[1][0] == '*') && (argv[1][1] == 0)) {
--- 1950,1953 ----
***************
*** 1972,1977 ****
  static OPTION_FUNC(opt_width)
  {
-     (void)override;
- 
      if (argc > 1) {
  	unsigned int new_width = strtoul(argv[1], NULL, 0);
--- 1965,1968 ----
***************
*** 1991,1996 ****
  static OPTION_FUNC(opt_tablewidth)
  {
-     (void)override;
- 
      if (argc > 1) {
  	unsigned int new_width = strtoul(argv[1], NULL, 0);
--- 1982,1985 ----
***************
*** 2010,2015 ****
  static OPTION_FUNC(opt_color)
  {
-     (void)override;
- 
      if (argc > 1) {
  	if (enabled_string(argv[1])) {
--- 1999,2002 ----
***************
*** 2029,2034 ****
  static OPTION_FUNC(opt_privmsg)
  {
-     (void)override;
- 
      if (argc > 1) {
  	if (enabled_string(argv[1])) {
--- 2016,2019 ----
***************
*** 2049,2053 ****
  {
      char *style;
-     (void)override;
  
      if (argc > 1) {
--- 2034,2037 ----
***************
*** 2076,2080 ****
      char *choice;
  
-     (void)override;
      if (argc > 1) {
          if (enabled_string(argv[1])) {
--- 2060,2063 ----
***************
*** 2341,2346 ****
  static NICKSERV_FUNC(cmd_status)
  {
-     (void)argc; (void)argv; /* ignore them!  ignore them all! */
- 
      if (nickserv_conf.disable_nicks) {
          nickserv_notice(user, NSMSG_GLOBAL_STATS_NONICK,
--- 2324,2327 ----
***************
*** 2388,2392 ****
  static NICKSERV_FUNC(cmd_vacation)
  {
-     (void)argc; (void)argv;
      HANDLE_SET_FLAG(user->handle_info, FROZEN);
      nickserv_notice(user, NSMSG_ON_VACATION);
--- 2369,2372 ----
***************
*** 2396,2404 ****
  static NICKSERV_FUNC(cmd_version)
  {
-     (void)argc; (void)argv;
- 
      nickserv_notice(user, MSG_VERSION);
      nickserv_notice(user, NSMSG_VERSION_ID);
- 
      return 1;
  }
--- 2376,2381 ----
***************
*** 2840,2846 ****
  
  static void
! search_count_func(struct userNode *source, struct handle_info *match)
  {
-     (void)source; (void)match;
  }
  
--- 2817,2822 ----
  
  static void
! search_count_func(UNUSED_ARG(struct userNode *source), UNUSED_ARG(struct handle_info *match))
  {
  }
  
***************
*** 3040,3044 ****
  
  static void
! expire_handles(void *data)
  {
      dict_iterator_t it, next;
--- 3016,3020 ----
  
  static void
! expire_handles(UNUSED_ARG(void *data))
  {
      dict_iterator_t it, next;
***************
*** 3046,3050 ****
      struct handle_info *hi;
  
-     (void)data;
      for (it=dict_first(nickserv_handle_dict); it; it=next) {
          next = iter_next(it);
--- 3022,3025 ----
***************
*** 3316,3322 ****
  
  void
! nickserv_remove_user(struct userNode *user, struct userNode *killer, const char *why)
  {
-     (void)killer; (void)why;
      if (user->auth_policer) policer_delete(user->auth_policer);
      dict_remove(nickserv_allow_auth_dict, user->nick);
--- 3291,3296 ----
  
  void
! nickserv_remove_user(struct userNode *user, UNUSED_ARG(struct userNode *killer), UNUSED_ARG(const char *why))
  {
      if (user->auth_policer) policer_delete(user->auth_policer);
      dict_remove(nickserv_allow_auth_dict, user->nick);

Index: opserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/opserv.c,v
retrieving revision 1.327
retrieving revision 1.328
diff -C2 -r1.327 -r1.328
*** opserv.c	20 Jul 2003 13:18:22 -0000	1.327
--- opserv.c	22 Jul 2003 18:32:20 -0000	1.328
***************
*** 217,220 ****
--- 217,221 ----
  #define OSMSG_REHASH_FAILED	"Rehash of configuration database failed, previous configuration is intact."
  #define OSMSG_REOPEN_COMPLETE	"Closed and reopened all log files."
+ #define OSMSG_RECONNECTING      "Reconnecting to my uplink."
  #define OSMSG_NUMERIC_COLLIDE   "That numeric is already in use."
  #define OSMSG_NAME_COLLIDE      "That name is already in use."
***************
*** 244,258 ****
  #define OPSERV_FUNC(NAME) MODCMD_FUNC(NAME)
  #define OPSERV_SYNTAX() 	svccmd_send_help(user, opserv, cmd)
[...1101 lines suppressed...]
!     opserv_define_func("TRACE", cmd_trace, 100, 0, 3);
!     opserv_define_func("TRACE PRINT", NULL, 0, 0, 0);
!     opserv_define_func("TRACE COUNT", NULL, 0, 0, 0);
!     opserv_define_func("TRACE DOMAINS", NULL, 0, 0, 0);
!     opserv_define_func("TRACE GLINE", NULL, 600, 0, 0);
!     opserv_define_func("TRACE GAG", NULL, 600, 0, 0);
!     opserv_define_func("TRACE KILL", NULL, 600, 0, 0);
!     opserv_define_func("UNBAN", cmd_unban, 100, 2, 2);
!     opserv_define_func("UNGAG", cmd_ungag, 600, 0, 2);
!     opserv_define_func("UNGLINE", cmd_ungline, 600, 0, 2);
      modcmd_register(opserv_module, "GTRACE UNGLINE", NULL, 0, 0, "template", "ungline", NULL);
!     opserv_define_func("UNJUPE", cmd_unjupe, 900, 0, 2);
!     opserv_define_func("UNRESERVE", cmd_unreserve, 800, 0, 2);
!     opserv_define_func("UNWARN", cmd_unwarn, 800, 0, 0);
!     opserv_define_func("VERSION", cmd_version, 0, 0, 0);
!     opserv_define_func("VOICEALL", cmd_voiceall, 300, 2, 0);
!     opserv_define_func("WARN", cmd_warn, 800, 0, 2);
!     opserv_define_func("WHOIS", cmd_whois, 0, 0, 2);
  
      opserv_reserved_nick_dict = dict_new();

Index: proto-bahamut.c
===================================================================
RCS file: /cvsroot/srvx/services/src/proto-bahamut.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** proto-bahamut.c	12 Jul 2003 03:18:33 -0000	1.39
--- proto-bahamut.c	22 Jul 2003 18:32:20 -0000	1.40
***************
*** 42,49 ****
  
  struct server *
! AddServer(struct server *uplink, const char *name, int hops, time_t boot, time_t link, const char *numeric, const char *description) {
      struct server* sNode;
  
-     (void)numeric;
      sNode = calloc(1, sizeof(*sNode));
      sNode->uplink = uplink;
--- 42,48 ----
  
  struct server *
! AddServer(struct server *uplink, const char *name, int hops, time_t boot, time_t link, UNUSED_ARG(const char *numeric), const char *description) {
      struct server* sNode;
  
      sNode = calloc(1, sizeof(*sNode));
      sNode->uplink = uplink;
***************
*** 366,371 ****
  
  void
! irc_wallchops(struct userNode *from, const char *to, const char *message) {
!     (void)from; (void)to; (void)message;
  }
  
--- 365,369 ----
  
  void
! irc_wallchops(UNUSED_ARG(struct userNode *from), UNUSED_ARG(const char *to), UNUSED_ARG(const char *message)) {
  }
  
***************
*** 444,451 ****
  
  void
! irc_settime(const char *srv_name_mask, time_t new_time)
  {
      /* Bahamut has nothing like this, so ignore it. */
-     (void)srv_name_mask;
  }
  
--- 442,448 ----
  
  void
! irc_settime(UNUSED_ARG(const char *srv_name_mask), UNUSED_ARG(time_t new_time))
  {
      /* Bahamut has nothing like this, so ignore it. */
  }
  
***************
*** 596,600 ****
      unsigned int nn, mm;
  
-     (void)origin;
      uplink_capab = 0;
      for(nn=1; nn<argc; nn++) {
--- 593,596 ----
***************
*** 701,705 ****
      if (argc < 5) return 0;
      if ((atoi(argv[1]) < 3) || (atoi(argv[2]) > 3)) return 0;
-     (void)origin;
      /* TODO: something with the timestamp we get from the other guy */
      return 1;
--- 697,700 ----
***************
*** 718,722 ****
  static CMD_FUNC(cmd_burst) {
      struct server *sender = GetServerH(origin);
-     (void)argv;
      if (!sender) return 0;
      if (argc == 1) return 1;
--- 713,716 ----
***************
*** 759,763 ****
      unsigned char *nick, *nickend;
  
-     (void)origin;
      if ((argc == 3) && (uNode = GetUserH(origin))) {
          /* normal JOIN */
--- 753,756 ----
***************
*** 837,841 ****
  static CMD_FUNC(cmd_topic) {
      struct chanNode *cn;
-     (void)origin;
      if (argc < 5) return 0;
      if (!(cn = GetChannel(argv[1]))) {
--- 830,833 ----
***************
*** 863,867 ****
      struct userNode *un;
  
-     (void)argv;
      if (!(un = GetUserH(origin))) {
          log(MAIN_LOG, LOG_ERROR, "Unable to find user %s sending AWAY\n", origin);
--- 855,858 ----
***************
*** 899,903 ****
  static CMD_FUNC(cmd_pong)
  {
-     (void)origin;
      if (argc < 3) return 0;
      if (!strcmp(argv[2], self->name)) {
--- 890,893 ----
***************
*** 924,928 ****
  static CMD_FUNC(cmd_squit)
  {
!     (void)argc; (void)argv; (void)origin; return 0; /* TODO: cmd_squit() */
  }
  
--- 914,918 ----
  static CMD_FUNC(cmd_squit)
  {
!     return 0; /* TODO: cmd_squit() */
  }
  
***************
*** 930,934 ****
  {
      struct userNode *target, *dest;
-     (void)origin;
      if (argc < 4) return 0;
      if (!(target = GetUserH(argv[1]))) return 0;
--- 920,923 ----

Index: proto-common.c
===================================================================
RCS file: /cvsroot/srvx/services/src/proto-common.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** proto-common.c	13 Jul 2003 19:11:02 -0000	1.31
--- proto-common.c	22 Jul 2003 18:32:20 -0000	1.32
***************
*** 267,271 ****
  }
  
! #define CMD_FUNC(NAME) int NAME(const unsigned char *origin, unsigned int argc, unsigned char *argv[])
  typedef CMD_FUNC(cmd_func_t);
  
--- 267,271 ----
  }
  
! #define CMD_FUNC(NAME) int NAME(UNUSED_ARG(const unsigned char *origin), UNUSED_ARG(unsigned int argc), UNUSED_ARG(unsigned char *argv[]))
  typedef CMD_FUNC(cmd_func_t);
  
***************
*** 275,282 ****
   * the queue at any given time). */
  void
! timed_send_ping(void *data)
  {
-     (void)data;
- 
      irc_ping(self->name);
      timeq_add(now + ping_timeout, timed_ping_timeout, 0);
--- 275,280 ----
   * the queue at any given time). */
  void
! timed_send_ping(UNUSED_ARG(void *data))
  {
      irc_ping(self->name);
      timeq_add(now + ping_timeout, timed_ping_timeout, 0);
***************
*** 284,291 ****
  
  static void
! timed_ping_timeout(void *data)
  {
-     (void)data;
- 
      /* Uplink "health" tracking could be accomplished by counting the
         number of ping timeouts that happen for each uplink. After the
--- 282,287 ----
  
  static void
! timed_ping_timeout(UNUSED_ARG(void *data))
  {
      /* Uplink "health" tracking could be accomplished by counting the
         number of ping timeouts that happen for each uplink. After the
***************
*** 300,304 ****
  
      if (argc < 2) return 0;
-     (void)origin;
      true_pass = cManager.uplink->their_password;
      if (true_pass && strcmp(true_pass, argv[1])) {
--- 296,299 ----
***************
*** 316,320 ****
  static CMD_FUNC(cmd_dummy)
  {
-     (void)origin; (void)argc; (void)argv;
      /* we don't care about these messages */
      return 1;
--- 311,314 ----
***************
*** 323,328 ****
  static CMD_FUNC(cmd_error)
  {
-     (void)argc; (void)origin;
- 
      if (argv[1]) log_module(MAIN_LOG, LOG_ERROR, "Error: %s", argv[1]);
      log_module(MAIN_LOG, LOG_ERROR, "Error received from uplink, squitting.");
--- 317,320 ----
***************
*** 390,394 ****
  {
      struct userNode *user;
-     (void)argc; (void)argv;
      if (!(user = GetUserH(origin))) {
          log_module(MAIN_LOG, LOG_ERROR, "Could not find VERSION origin user %s", origin);
--- 382,385 ----
***************
*** 404,408 ****
      struct string_list *slist;
  
-     (void)argc; (void)argv;
      if (!(user = GetUserH(origin))) {
          log_module(MAIN_LOG, LOG_ERROR, "Could not find ADMIN origin user %s", origin);
--- 395,398 ----

Index: proto-p10.c
===================================================================
RCS file: /cvsroot/srvx/services/src/proto-p10.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -r1.69 -r1.70
*** proto-p10.c	21 Jul 2003 21:51:54 -0000	1.69
--- proto-p10.c	22 Jul 2003 18:32:20 -0000	1.70
***************
*** 412,424 ****
  
  void
! irc_regnick(struct userNode *user)
  {
-     (void)user;
  }
  
  void
! irc_nick(struct userNode *user, const char *old_nick)
  {
-     (void)old_nick;
      putsock("%s " P10_NICK " %s "FMT_TIME_T, user->numeric, user->nick, now);
  }
--- 412,422 ----
  
  void
! irc_regnick(UNUSED_ARG(struct userNode *user))
  {
  }
  
  void
! irc_nick(struct userNode *user, UNUSED_ARG(const char *old_nick))
  {
      putsock("%s " P10_NICK " %s "FMT_TIME_T, user->numeric, user->nick, now);
  }
***************
*** 798,802 ****
      struct server *sender;
      dict_iterator_t it;
-     (void)argc; (void)argv; /* we don't care about these */
  
      if (!(sender = GetServerH(origin))) return 0;
--- 796,799 ----
***************
*** 819,823 ****
  {
      extern time_t burst_begin;
-     (void)argc; (void)argv; /* we don't care about these */
  
      if (GetServerH(origin) == self->uplink) {
--- 816,819 ----
***************
*** 849,853 ****
  {
      /* Go back to original IRC length .. and try to reconnect :/ */
-     (void)origin; (void)argc; (void)argv;
      change_nicklen(9);
      irc_squit(self, "Got erroneous nickname, truncating nicks.", NULL);
--- 845,848 ----
***************
*** 920,924 ****
  static CMD_FUNC(cmd_pong)
  {
-     (void)origin;
      if (argc < 3) return 0;
      if (!strcmp(argv[2], self->name)) {
--- 915,918 ----
***************
*** 982,986 ****
      time_t in_timestamp;
  
-     (void)origin;
      if (argc < 3) return 0;
      modes[0] = 0;
--- 976,979 ----
***************
*** 1147,1151 ****
      static struct chanNode *cn;
  
-     (void)origin;
      if (!argv[0]) return 0; /* huh? */
      if (argv[2]) {
--- 1140,1143 ----
***************
*** 1196,1200 ****
  {
      struct userNode *user;
-     (void)origin;
      if (argc < 2) return 0;
      if (!(user = GetUser(argv[1]))) {
--- 1188,1191 ----
***************
*** 1240,1244 ****
      struct server *server;
  
-     (void)origin;
      if (argc < 4) return 0;
      if (!(server = GetServerH(argv[1]))) return 0;
--- 1231,1234 ----
***************
*** 1285,1289 ****
      struct userNode *uNode;
  
-     (void)argv;
      uNode = GetUserH(origin);
      if (!uNode) return 1;
--- 1275,1278 ----
***************
*** 1312,1316 ****
  {
      struct userNode *target, *dest;
-     (void)origin;
      if (argc < 4) return 0;
      if (!(target = GetUserN(argv[1]))) return 0;
--- 1301,1304 ----

Index: saxdb.c
===================================================================
RCS file: /cvsroot/srvx/services/src/saxdb.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** saxdb.c	7 Jul 2003 16:29:34 -0000	1.29
--- saxdb.c	22 Jul 2003 18:32:20 -0000	1.30
***************
*** 238,242 ****
  }
  #else
! #define saxdb_pre_object(DEST) (void)DEST
  #endif
  
--- 238,242 ----
  }
  #else
! #define saxdb_pre_object(DEST) 
  #endif
  
***************
*** 390,394 ****
      struct timeval start, stop;
  
-     (void)argv;
      gettimeofday(&start, NULL);
      saxdb_write_all();
--- 390,393 ----
***************
*** 409,413 ****
      unsigned int ii;
  
-     (void)argv;
      tbl.length = dict_size(saxdbs) + 1;
      tbl.width = 5;
--- 408,411 ----

Index: sendmail.c
===================================================================
RCS file: /cvsroot/srvx/services/src/sendmail.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** sendmail.c	7 Jul 2003 16:29:34 -0000	1.12
--- sendmail.c	22 Jul 2003 18:32:20 -0000	1.13
***************
*** 272,276 ****
      int found = 0;
  
-     (void)argv;
      for (it=dict_first(prohibited_addrs); it; it=iter_next(it)) {
          reply(MODMSG_PROHIBITED_EMAIL, iter_key(it), (const char*)iter_data(it));
--- 272,275 ----

Index: sockcheck.c
===================================================================
RCS file: /cvsroot/srvx/services/src/sockcheck.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -C2 -r1.89 -r1.90
*** sockcheck.c	10 Jul 2003 23:04:57 -0000	1.89
--- sockcheck.c	22 Jul 2003 18:32:20 -0000	1.90
***************
*** 934,938 ****
  
  static void
! sockcheck_clean_cache(void *data)
  {
      dict_t curr_clients;
--- 934,938 ----
  
  static void
! sockcheck_clean_cache(UNUSED_ARG(void *data))
  {
      dict_t curr_clients;
***************
*** 942,946 ****
      int max_age;
  
-     (void)data;
      if (SOCKCHECK_DEBUG) {
          struct string_buffer sb;
--- 942,945 ----