[srvx-commits] CVS: services/src helpserv.c,1.45,1.46 saxdb.c,1.19,1.20

[Adrian D. <sai...@us...>]

Update of /cvsroot/srvx/services/src
In directory usw-pr-cvs1:/tmp/cvs-serv17155

Modified Files:
	helpserv.c saxdb.c 
Log Message:
Compile fixes (this just isn't my night)


Index: helpserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/helpserv.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -r1.45 -r1.46
*** helpserv.c	4 Nov 2002 03:26:03 -0000	1.45
--- helpserv.c	4 Nov 2002 04:28:22 -0000	1.46
***************
*** 191,195 ****
  #define HSMSG_PAGE_ASSIGN_REQUEST "Request ID#%lu from $b%s$b (Account %s) has been assigned to %s."
  #define HSMSG_PAGE_HELPER_GONE   "Request ID#%lu from $b%s$b (Account %s) $bhas been unassigned$b, as its helper, %s has %s."
! #define HSMSG_PAGE_WHINE_HEADER  "$b%u unhandled request%c$b waiting at least $b%s$b:"
  #define HSMSG_PAGE_IDLE_HEADER   "$b%u users$b in %s $bidle at least %s$b:"
  #define HSMSG_PAGE_EMPTYALERT    "$b%s has no helpers present$b"
--- 191,195 ----
  #define HSMSG_PAGE_ASSIGN_REQUEST "Request ID#%lu from $b%s$b (Account %s) has been assigned to %s."
  #define HSMSG_PAGE_HELPER_GONE   "Request ID#%lu from $b%s$b (Account %s) $bhas been unassigned$b, as its helper, %s has %s."
! #define HSMSG_PAGE_WHINE_HEADER  "$b%u unhandled request%s$b waiting at least $b%s$b:"
  #define HSMSG_PAGE_IDLE_HEADER   "$b%u users$b in %s $bidle at least %s$b:"
  #define HSMSG_PAGE_EMPTYALERT    "$b%s has no helpers present$b"
***************
*** 2099,2103 ****
              }
  
!             helpserv_page(PGSRC_ALERT, HSMSG_PAGE_WHINE_HEADER, reqlist.used, (reqlist.used == 1 ? '' : 's'), strwhinedelay);
              table_send(hs->helpserv, hs->page_targets[PGSRC_ALERT]->name, 0, page_type_funcs[hs->page_types[PGSRC_ALERT]], tbl);
  
--- 2099,2103 ----
              }
  
!             helpserv_page(PGSRC_ALERT, HSMSG_PAGE_WHINE_HEADER, reqlist.used, (reqlist.used == 1 ? "" : "s"), strwhinedelay);
              table_send(hs->helpserv, hs->page_targets[PGSRC_ALERT]->name, 0, page_type_funcs[hs->page_types[PGSRC_ALERT]], tbl);
  
***************
*** 2107,2111 ****
              }
  #else
!             helpserv_page(PGSRC_ALERT, HSMSG_PAGE_WHINE_HEADER, reqlist.used, (reqlist.used == 1 ? '' : 's'), strwhinedelay);
  #endif
          }
--- 2107,2111 ----
              }
  #else
!             helpserv_page(PGSRC_ALERT, HSMSG_PAGE_WHINE_HEADER, reqlist.used, (reqlist.used == 1 ? "" : "s"), strwhinedelay);
  #endif
          }

Index: saxdb.c
===================================================================
RCS file: /cvsroot/srvx/services/src/saxdb.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** saxdb.c	4 Nov 2002 03:47:10 -0000	1.19
--- saxdb.c	4 Nov 2002 04:28:22 -0000	1.20
***************
*** 493,498 ****
  void
  saxdb_close_context(struct saxdb_context *ctx) {
!     assert(ctx.complex.used == 0);
!     int_list_clean(&ctx.complex);
      free(ctx);
  }
--- 493,498 ----
  void
  saxdb_close_context(struct saxdb_context *ctx) {
!     assert(ctx->complex.used == 0);
!     int_list_clean(&ctx->complex);
      free(ctx);
  }