PennMUSH Community

Changeset 566

Show
Ignore:
Timestamp:
11/26/06 12:32:34 (2 years ago)
Author:
penndev
Message:

PennMUSH 1.8.2p0 release candidate 5.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • 1.8.2/trunk/src/command.c

    r531 r566  
    17041704{ 
    17051705  int ok; 
    1706   char *mess = NULL; 
     1706  const char *mess = NULL; 
    17071707  int check_flags, check_powers; 
    17081708 

  • 1.8.2/trunk/src/cque.c

    r523 r566  
    6666void free_qentry(BQUE *point); 
    6767static int pay_queue(dbref player, const char *command); 
    68 void wait_que(dbref player, int wait, char *command, 
     68void wait_que(dbref player, int waituntil, char *command, 
    6969          dbref cause, dbref sem, const char *semattr, int until); 
    7070int que_next(void); 
    …… 
    342342 * to the back of the queue. 
    343343 * \param player the enqueuing object. 
    344  * \param wait time to wait, or 0. 
     344 * \param waittill time to wait, or 0. 
    345345 * \param command command to enqueue. 
    346346 * \param cause object that caused command to be enqueued. 
    …… 
    350350 */ 
    351351void 
    352 wait_que(dbref player, int wait, char *command, dbref cause, dbref sem, 
     352wait_que(dbref player, int waittill, char *command, dbref cause, dbref sem, 
    353353     const char *semattr, int until) 
    354354{ 
    355355  BQUE *tmp; 
    356356  int a; 
    357   if (wait == 0) { 
     357  if (waittill == 0) { 
    358358    if (sem != NOTHING) 
    359359      add_to_sem(sem, -1, semattr); 
    …… 
    386386 
    387387  if (until) { 
    388     tmp->left = wait; 
     388    tmp->left = waittill; 
    389389  } else { 
    390     if (wait >= 0) 
    391       tmp->left = mudtime + wait; 
     390    if (waittill >= 0) 
     391      tmp->left = mudtime + waittill; 
    392392    else 
    393393      tmp->left = 0;        /* semaphore wait without a timeout */ 

  • 1.8.2/trunk/src/db.c

    r557 r566  
    10141014 
    10151015  for (;;) { 
    1016     int c; 
    1017  
    1018     c = fgetc(f); 
    1019     ungetc(c, f); 
    1020  
    1021     if (c != ' ') 
     1016    int ch; 
     1017 
     1018    ch = fgetc(f); 
     1019    ungetc(ch, f); 
     1020 
     1021    if (ch != ' ') 
    10221022      break; 
    10231023 

  • 1.8.2/trunk/src/extchat.c

    r531 r566  
    156156      list_partial_matches(player, name, PMATCH_ALL); \ 
    157157      return; \ 
     158    case CMATCH_EXACT: \ 
     159    case CMATCH_PARTIAL: \ 
    158160    default: \ 
    159161      break; \ 
    …… 
    34693471} 
    34703472 
     3473/* msg is a printf-style format that has exactly and only 2 %s specifiers 
     3474   in it. */ 
    34713475static void 
    34723476format_channel_broadcast(CHAN *chan, CHANUSER *u, 

  • 1.8.2/trunk/src/help.c

    r531 r566  
    3232static const char *string_spitfile(help_file *help_dat, char *arg1); 
    3333static help_indx *help_find_entry(help_file *help_dat, const char *the_topic); 
    34 static char *list_matching_entries(char *pattern, help_file *help_dat, 
    35                   const char *sep); 
     34static const char *list_matching_entries(char *pattern, help_file *help_dat, 
     35                    const char *sep); 
    3636static const char *normalize_entry(help_file *help_dat, char *arg1); 
    3737 
    …… 
    543543 
    544544/** Return a string with all help entries that match a pattern */ 
    545 static char * 
     545static const char * 
    546546list_matching_entries(char *pattern, help_file *help_dat, const char *sep) 
    547547{ 

  • 1.8.2/trunk/src/look.c

    r557 r566  
    5151             int skipdef, const char *prefix); 
    5252static char *parent_chain(dbref player, dbref thing); 
     53 
     54static void insert_spaces(int count, int dospace, char *buff, char **bp); 
    5355 
    5456extern PRIV attr_privs_view[]; 
    …… 
    13921394extern char escaped_chars[UCHAR_MAX + 1]; 
    13931395 
    1394 void 
     1396static void 
    13951397insert_spaces(int count, int dospace, char *buff, char **bp) 
    13961398{ 

  • 1.8.2/trunk/src/wild.c

    r473 r566  
    588588/** Either an order comparison or a wildcard match with no memory. 
    589589 * 
    590  * This routine will cause crashes if fed NULLs instead of strings. 
    591590 * 
    592591 * \param s pattern to match against. 
    …… 
    599598local_wild_match_case(const char *RESTRICT s, const char *RESTRICT d, int cs) 
    600599{ 
    601   switch (*s) { 
    602   case '>': 
    603     s++; 
    604     if (is_number(s) && is_number(d)) 
    605       return (parse_number(s) < parse_number(d)); 
    606     else 
    607       return (strcoll(s, d) < 0); 
    608   case '<': 
    609     s++; 
    610     if (is_number(s) && is_number(d)) 
    611       return (parse_number(s) > parse_number(d)); 
    612     else 
    613       return (strcoll(s, d) > 0); 
    614   } 
    615  
    616   return quick_wild_new(s, d, cs); 
     600  if (s && *s) { 
     601    switch (*s) { 
     602    case '>': 
     603      s++; 
     604      if (is_number(s) && is_number(d)) 
     605    return (parse_number(s) < parse_number(d)); 
     606      else 
     607    return (strcoll(s, d) < 0); 
     608    case '<': 
     609      s++; 
     610      if (is_number(s) && is_number(d)) 
     611    return (parse_number(s) > parse_number(d)); 
     612      else 
     613    return (strcoll(s, d) > 0); 
     614    default: 
     615      return quick_wild_new(s, d, cs); 
     616    } 
     617  } else 
     618    return 0; 
    617619} 
    618620