PennMUSH Community

Changeset 816

Show
Ignore:
Timestamp:
05/05/07 23:43:39 (2 years ago)
Author:
shawnw
Message:

Bumped up patchlevel, ran make indent, versions

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • 1.8.2/branches/devel/CHANGES.182

    r814 r816  
    1515========================================================================== 
    1616 
    17 Version 1.8.2 patchlevel 4                      ???, 2007 
     17Version 1.8.2 patchlevel 4                      May ??, 2007 
    1818 
    1919Minor changes: 

  • 1.8.2/branches/devel/Patchlevel

    r715 r816  
    11Do not edit this file. It is maintained by the official PennMUSH patches. 
    2 This is PennMUSH 1.8.2p3 
     2This is PennMUSH 1.8.2p4 

  • 1.8.2/branches/devel/game/txt/hlp/pennv181.hlp

    r543 r816  
    11& 1.8.1p10 
    22Version 1.8.1 patchlevel 10                     September 13, 2006 
    3  
    43Fixes: 
    54  * Cleaned up some compiler warnings. [SW] 
    …… 
    1110  * Trying to ignore signals could crash on Win32. Reported by Intrevis. 
    1211  * Fixed parse errors in non-C99 compilers. Reported by Intrevis. 
    13   * Help fixes by Talvo, Sketch. 
     12  * Help fixes by Talvo, Sketch 
    1413  * Fixes for 64-bit platforms [SW] 
    1514  * @dump/paranoid produced corrupt databases.  
    …… 
    2928  * The above is used in db.c, function.c and plyrlist.c [SW] 
    3029  * @config compile reports if MySQL support is present. (This does not  
    31     mean the game is configured to use it.) 
     30    mean the game is configured to use it.) [SW] 
    3231  * restart copies log files from the last time the mush was running to 
    3332    game/save/ instead of deleting them. [SW] 
    …… 
    172171  * NT_TCP code has been removed from the server. It was deemed 
    173172    less useful than keeping the networking code unitary and 
    174 <    the ability to @shutdown/reboot. Patch by Nathan Baum. 
     173    the ability to @shutdown/reboot. Patch by Nathan Baum. 
    175174Flags: 
    176175  * New LOUD flag (admin-settable) causes an object to bypass 

  • 1.8.2/branches/devel/game/txt/hlp/pennv182.hlp

    r715 r816  
    1 & 1.8.2p3 
     1& 1.8.2p4 
    22& changes 
    33This is a list of changes in this patchlevel which are probably of 
    …… 
    1212be read in 'help patchlevels'. 
    1313 
     14Version 1.8.2 patchlevel 4                      May ??, 2007 
     15 
     16Minor changes: 
     17  * speak() uses accented names. Sketch. 
     18  * config() no longer lists options that can't be set 
     19    with @config/set. Suggested by Trispis. [SW] 
     20  * 'page foo\=bar' pages the last person you paged. Fix by Nathan 
     21    Baum. 
     22  * Receipt of a SIGUSR1 (Causing a shutdown/reboot) is explictly 
     23    logged. Suggested by Interloper. [SW] 
     24  * @wipe reports the number of attributes deleted. [183] 
     25 
     26Fixes: 
     27  * You can no longer save objects slated to be destroyed 
     28    by using @set foo=!GOING (The help file for GOING now tells 
     29    the truth) Reported by Cooee. [SW]  
     30  * Useless variable in real_unparse() removed. Reported by 
     31    Taladan. [SW] 
     32  * 'make portmsg' works, and portmsg.c rewritten to current 
     33    Penn standards. [SW] 
     34  * case() would replace #$ in the default argument, contrary 
     35    to the help file. Reported by Talvo. [SW] 
     36  * Memory leak in grep(). [SW] 
     37  * Quotes can be around the player name on the login screen 
     38    always, instead of just when player_name_spaces was 
     39    on. Suggested by Dan Widdis. [SW] 
     40  * '{think foo} bar' exhibited odd behavior. [GM] 
     41  * 'make test' wouldn't work right unless '.' was in you path. 
     42     Fix by Nathan Baum. 
     43  * stdin and stdout weren't getting closed, potentially causing 
     44    problems when trying to log out of a shell after starting 
     45    a mush. Reported by K Moon. [SW] 
     46  * NetBSD compile and general warning fixes. [SW] 
     47  * Favor difftime(3) over subtraction of time_t variables. [SW] 
     48  * Clarification of attribute trees in HELP @WIPE. Suggested by 
     49    Talvo. 
     50  * Loading a db with empty attributes used as the roots of 
     51    attribute trees didn't work if empty_attrs is set to no. 
     52    Reported by Kevin. [SW] 
     53  * Bugs in wiping attribute trees with attributes the wiper 
     54    doesn't have permission to delete fixed. [SW] 
     55  
     56& 1.8.2p3 
    1457Version 1.8.2 patchlevel 3                      March 11, 2007 
    1558 
    …… 
    5497    of the name for @ahear/@aahear/@amhear. [SW] 
    5598  * Fixed the distribution of random numbers with a huge range. Reported 
    56     by Luke. 
     99    by Luke.  
    57100 
    58101& 1.8.2p1 

  • 1.8.2/branches/devel/game/txt/hlp/pennvOLD.hlp

    r581 r816  
    44184418type 'help <version>p<patchlevel>'. For example, 'help 1.7.2p3' 
    44194419 
    4420 1.8.2: 0, 1 
     44201.8.2: 0, 1, 2, 3, 4 
    442144211.8.1: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 
    442244221.8.0: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 

  • 1.8.2/branches/devel/hdrs/attrib.h

    r814 r816  
    4242  AE_OKAY = 0, /**< Success */ 
    4343  AE_ERROR = -1, /**< general failure */ 
    44   AE_SAFE = -2, /**< attempt to overwrite a safe attribute */ 
     44  AE_SAFE = -2,    /**< attempt to overwrite a safe attribute */ 
    4545  AE_BADNAME = -3, /**< invalid name */ 
    4646  AE_TOOMANY = -4, /**< too many attribs */ 
    47   AE_TREE = -5, /**< unable to delete/create entire tree */ 
     47  AE_TREE = -5,    /**< unable to delete/create entire tree */ 
    4848  AE_NOTFOUND = -6 /** No such attribute */ 
    4949} atr_err; 
    …… 
    5757            unsigned int flags, unsigned char derefs); 
    5858extern atr_err atr_add(dbref thing, char const *RESTRICT atr, 
    59            char const *RESTRICT s, dbref player, unsigned int flags); 
     59               char const *RESTRICT s, dbref player, 
     60               unsigned int flags); 
    6061extern atr_err atr_clr(dbref thing, char const *atr, dbref player); 
    6162extern atr_err wipe_atr(dbref thing, char const *atr, dbref player); 
    …… 
    7980              const char *str); 
    8081extern int do_set_atr(dbref thing, char const *RESTRICT atr, 
    81               char const *RESTRICT s, dbref player, int flags); 
     82              char const *RESTRICT s, dbref player, unsigned int flags); 
    8283extern void do_atrlock(dbref player, char const *arg1, char const *arg2); 
    8384extern void do_atrchown(dbref player, char const *arg1, char const *arg2); 
    …… 
    9899 
    99100/* possible attribute flags */ 
    100 #define AF_EMPTY_FLAGS  0x0     /**< No flag at all */ 
     101#define AF_EMPTY_FLAGS  0x0    /**< No flag at all */ 
    101102#define AF_ODARK        0x1 /**< OBSOLETE! Leave here but don't use */ 
    102103#define AF_INTERNAL     0x2 /**< no one can see it or set it */ 
    …… 
    112113#define AF_CASE         0x800   /**< Match $/^ patterns case-sensitive */ 
    113114#define AF_SAFE         0x1000  /**< This attribute may not be modified */ 
    114 #define AF_ROOT         0x2000  /**< Root of an attribute tree */ 
    115 #define AF_UNDEF1       0x4000  /**< Undefined; reserved for a future flag */ 
    116 #define AF_UNDEF2       0x8000  /**< Undefined; reserved for a future flag */ 
     115#define AF_ROOT         0x2000 /**< Root of an attribute tree */ 
     116#define AF_UNDEF1       0x4000 /**< Undefined; reserved for a future flag */ 
     117#define AF_UNDEF2       0x8000 /**< Undefined; reserved for a future flag */ 
    117118#define AF_STATIC       0x10000 /**< OBSOLETE! Leave here but don't use */ 
    118119#define AF_COMMAND      0x20000 /**< INTERNAL: value starts with $ */ 
    …… 
    131132#define AF_MHEAR        0x20000000  /**< ^-listens can be triggered by %! */ 
    132133#define AF_AHEAR        0x40000000  /**< ^-listens can be triggered by anyone */ 
    133 #define AF_UNDEF3       0x80000000      /**< Undefined; reserved for a future flag */ 
     134#define AF_UNDEF3       0x80000000 /**< Undefined; reserved for a future flag */ 
    134135 
    135 #define AF_MAXVAL       0x100000000     /**< Largest attribute flag value. */ 
     136#define AF_MAXVAL       0x100000000    /**< Largest attribute flag value. */ 
    136137 
    137138/*** external predefined attributes. */ 

  • 1.8.2/branches/devel/src/Makefile.SH

    r736 r816  
    212212    /usr/bin/expand $$file > tmpfile; mv -f tmpfile $$file; \ 
    213213    /usr/bin/indent -npro -kr -ci2 -ss -psl -ip4 -i2 -cs -l80 -lc75 \ 
    214     -T ATRALIAS -T DESC -T CNode -T CONF -T BQUE -T FUN \ 
     214    -T atr_err -T ATRALIAS -T DESC -T CNode -T CONF -T BQUE -T FUN \ 
    215215    -T NVAL -T i_rec -T f_rec -T USERFN_ENTRY -T PRIV -T FLAG \ 
    216216    -T FLAGENT -T FLAG_ALIAS -T tlist -T u -T stat -T tcheck -T ATTR \ 

  • 1.8.2/branches/devel/src/attrib.c

    r814 r816  
    7070static ATTR *find_atr_pos_in_list(ATTR ***pos, char const *name); 
    7171static atr_err can_create_attr(dbref player, dbref obj, char const *atr_name, 
    72                unsigned int flags); 
     72                   unsigned int flags); 
    7373static ATTR *find_atr_in_list(ATTR *atr, char const *name); 
    7474static ATTR *atr_get_with_parent(dbref obj, char const *atrname, dbref *parent); 
    …… 
    566566    root->data = chunk_create(t, u_strlen(t), 0); 
    567567    free(t); 
    568       }       
    569     } 
    570   } 
    571    
     568      } 
     569    } 
     570  } 
     571 
    572572  AL_FLAGS(ptr) = flags; 
    573573  AL_FLAGS(ptr) &= ~AF_COMMAND & ~AF_LISTEN; 
    …… 
    664664      free(t); 
    665665    } 
    666       } else  
     666      } else 
    667667    AL_FLAGS(root) |= AF_ROOT; 
    668668 
    …… 
    725725 
    726726  for (sub = atr_sub_branch(root); 
    727        sub && string_prefix(AL_NAME(sub), AL_NAME(root)); 
    728        sub = next) { 
     727       sub && string_prefix(AL_NAME(sub), AL_NAME(root)); sub = next) { 
    729728    if (AL_FLAGS(sub) & AF_ROOT) { 
    730729      if (!atr_clear_children(player, thing, sub)) { 
    …… 
    748747    atr_free_one(sub); 
    749748    AttrCount(thing)--; 
    750        
     749 
    751750  } 
    752751 
    …… 
    782781 
    783782  if ((AL_FLAGS(ptr) & AF_ROOT) && !we_are_wiping) 
    784       return AE_TREE; 
     783    return AE_TREE; 
    785784 
    786785  /* We only hit this if wiping. */ 
    787786  if (AL_FLAGS(ptr) & AF_ROOT) 
    788787    can_clear = atr_clear_children(player, thing, ptr); 
    789    
     788 
    790789  if (can_clear) { 
    791790    char *p; 
    …… 
    799798    atr_free_one(ptr); 
    800799    AttrCount(thing)--; 
    801      
     800 
    802801    /* If this was the only leaf of a tree, clear the AF_ROOT flag from 
    803802     * the parent. */ 
    …… 
    815814    if (!atr_sub_branch(root)) 
    816815      AL_FLAGS(root) &= ~AF_ROOT; 
    817       }         
     816      } 
    818817    } 
    819818 
    …… 
    838837 
    839838 
    840 /** \@wipe an attribute (And any leafs) from an object. 
     839/** \@wipe an attribute (And any leaves) from an object. 
    841840 * This function clears an attribute from an object.  
    842  * Permission is denied if the attribute is a branch, not a leaf. 
    843841 * \param thing object to clear attribute from. 
    844842 * \param atr name of attribute to remove. 
    …… 
    16231621int 
    16241622do_set_atr(dbref thing, const char *RESTRICT atr, const char *RESTRICT s, 
    1625        dbref player, int flags) 
     1623       dbref player, unsigned int flags) 
    16261624{ 
    16271625  ATTR *old; 
    16281626  char name[BUFFER_LEN]; 
    16291627  char tbuf1[BUFFER_LEN]; 
    1630   int res; 
     1628  atr_err res; 
    16311629  int was_hearer; 
    16321630  int was_listener; 
    …… 
    17251723  was_listener = Listener(thing); 
    17261724  res = 
    1727     s ? atr_add(thing, name, s, player, (flags & 0x02) ? AF_NOPROG : AF_EMPTY_FLAGS) 
     1725    s ? atr_add(thing, name, s, player, 
     1726        (flags & 0x02) ? AF_NOPROG : AF_EMPTY_FLAGS) 
    17281727    : atr_clr(thing, name, player); 
    17291728  switch (res) { 
    …… 
    17351734    if (!s) { 
    17361735      notify_format(player, 
    1737             T("Unable to remove '%s' because of a protected tree attribute."), 
     1736            T 
     1737            ("Unable to remove '%s' because of a protected tree attribute."), 
    17381738            name); 
    17391739      return 0; 
    17401740    } else { 
    17411741      notify_format(player, 
    1742             T("Unable to set '%s' because of a failure to create a needed parent attribute."), 
    1743             name);     
     1742            T 
     1743            ("Unable to set '%s' because of a failure to create a needed parent attribute."), 
     1744            name); 
    17441745      return 0; 
    17451746    } 
    …… 
    19591960 * \return the pointer to an attribute, or NULL on error. 
    19601961 */ 
    1961 static ATTR* 
     1962static ATTR * 
    19621963pop_free_list(void) 
    19631964{ 
    …… 
    19761977 */ 
    19771978static void 
    1978 push_free_list(ATTR *a)  
     1979push_free_list(ATTR *a) 
    19791980{ 
    19801981  memset(a, 0, sizeof(*a)); 

  • 1.8.2/branches/devel/src/bsd.c

    r814 r816  
    25592559  if (ModTime(player)) 
    25602560    notify_format(player, T("%ld failed connections since last login."), 
    2561           (long)ModTime(player)); 
     2561          (long) ModTime(player)); 
    25622562  ModTime(player) = (time_t) 0; 
    25632563  announce_connect(player, isnew, num); /* broadcast connect message */ 
    …… 
    33253325    dt = 0; 
    33263326 
    3327   delta = gmtime(& dt); 
     3327  delta = gmtime(&dt); 
    33283328  if (delta->tm_yday > 0) { 
    33293329    sprintf(buf, "%dd", delta->tm_yday); 

  • 1.8.2/branches/devel/src/conf.c

    r786 r816  
    15471547    for (cp = conftable; cp->name; cp++) { 
    15481548      if (cp->group) { 
    1549         if (first) 
    1550           first = 0; 
    1551         else 
    1552           safe_chr(' ', buff, bp); 
    1553         safe_str(cp->name, buff, bp); 
     1549   if (first) 
     1550     first = 0; 
     1551   else 
     1552     safe_chr(' ', buff, bp); 
     1553   safe_str(cp->name, buff, bp); 
    15541554      } 
    15551555    } 
    …… 
    15571557     cp = (PENNCONF *) hash_nextentry(&local_options)) { 
    15581558      if (cp->group) { 
    1559         if (first) 
    1560           first = 0; 
    1561         else 
    1562           safe_chr(' ', buff, bp); 
    1563         safe_str(cp->name, buff, bp); 
     1559   if (first) 
     1560     first = 0; 
     1561   else 
     1562     safe_chr(' ', buff, bp); 
     1563   safe_str(cp->name, buff, bp); 
    15641564      } 
    15651565    } 

  • 1.8.2/branches/devel/src/cque.c

    r814 r816  
    614614     item on it. Anything else is wasted time. */ 
    615615  if (qwait) { 
    616     curr = (int)difftime(qwait->left, mudtime); 
     616    curr = (int) difftime(qwait->left, mudtime); 
    617617    if (curr <= 2) 
    618618      return 1; 
    …… 
    624624    if (point->left == 0)   /* no timeout */ 
    625625      continue; 
    626     curr = (int)difftime(point->left, mudtime); 
     626    curr = (int) difftime(point->left, mudtime); 
    627627    if (curr <= 2) 
    628628      return 1; 
    …… 
    914914    switch (q_type) { 
    915915    case 1:     /* wait queue */ 
    916       notify_format(player, "[%ld]%s: %s", (long)difftime(tmp->left, mudtime), 
     916      notify_format(player, "[%ld]%s: %s", 
     917            (long) difftime(tmp->left, mudtime), 
    917918            unparse_object(player, tmp->player), tmp->comm); 
    918919      break; 
    …… 
    920921      if (tmp->left != 0) { 
    921922        notify_format(player, "[#%d/%s/%ld]%s: %s", tmp->sem, 
    922               tmp->semattr, (long)difftime(tmp->left, mudtime), 
     923              tmp->semattr, (long) difftime(tmp->left, mudtime), 
    923924              unparse_object(player, tmp->player), tmp->comm); 
    924925      } else { 

  • 1.8.2/branches/devel/src/funlist.c

    r703 r816  
    12391239  for (i = 0; i < nptrs; i++) { 
    12401240    /* Build our %0 args */ 
    1241     wenv[0] = (char *)ptrs[i]; 
     1241    wenv[0] = (char *) ptrs[i]; 
    12421242    call_ufun(&ufun, wenv, 2, result, executor, enactor, pe_info); 
    12431243    keys[i] = mush_strdup(result, "sortkey"); 

  • 1.8.2/branches/devel/src/funstr.c

    r793 r816  
    22322232    if (say) 
    22332233      safe_format(buff, bp, "%s %s \"%s\"", accented_name(speaker), 
    2234                   say_string, string); 
     2234         say_string, string); 
    22352235    else 
    22362236      safe_str(string, buff, bp); 
    …… 
    22492249    if (strlen(rbuff) > 0) { 
    22502250      safe_format(buff, bp, "%s %s %s", accented_name(speaker), 
    2251                   say_string, rbuff); 
     2251         say_string, rbuff); 
    22522252      return; 
    22532253    } else if (null == 1) { 

  • 1.8.2/branches/devel/src/game.c

    r814 r816  
    21262126        T 
    21272127        ("Time until next database save: %ld minutes %ld seconds, at %s"), 
    2128         ((long)difftime(options.dump_counter, mudtime)) / 60, 
    2129         ((long)difftime(options.dump_counter, mudtime)) % 60, tbuf1); 
     2128        ((long) difftime(options.dump_counter, mudtime)) / 60, 
     2129        ((long) difftime(options.dump_counter, mudtime)) % 60, tbuf1); 
    21302130 
    21312131  when = localtime(&options.dbck_counter); 
    …… 
    21342134        T 
    21352135        ("   Time until next dbck check: %ld minutes %ld seconds, at %s."), 
    2136         ((long)difftime(options.dbck_counter, mudtime)) / 60, 
    2137         ((long)difftime(options.dbck_counter, mudtime)) % 60, tbuf1); 
     2136        ((long) difftime(options.dbck_counter, mudtime)) / 60, 
     2137        ((long) difftime(options.dbck_counter, mudtime)) % 60, tbuf1); 
    21382138 
    21392139  when = localtime(&options.purge_counter); 
    …… 
    21422142        T 
    21432143        ("        Time until next purge: %ld minutes %ld seconds, at %s."), 
    2144         ((long)difftime(options.purge_counter, mudtime)) / 60, 
    2145         ((long)difftime(options.purge_counter, mudtime)) % 60, tbuf1); 
     2144        ((long) difftime(options.purge_counter, mudtime)) / 60, 
     2145        ((long) difftime(options.purge_counter, mudtime)) % 60, tbuf1); 
    21462146 
    21472147  if (options.warn_interval) { 
    …… 
    21512151          T 
    21522152          ("    Time until next @warnings: %ld minutes %ld seconds, at %s."), 
    2153           ((long)difftime(options.warn_counter, mudtime)) / 60, 
    2154           ((long)difftime(options.warn_counter, mudtime)) % 60, tbuf1); 
     2153          ((long) difftime(options.warn_counter, mudtime)) / 60, 
     2154          ((long) difftime(options.warn_counter, mudtime)) % 60, tbuf1); 
    21552155  } 
    21562156 
    …… 
    21582158        T 
    21592159        ("PennMUSH Uptime: %ld days %ld hours %ld minutes %ld seconds"), 
    2160         ((long)difftime(mudtime, globals.first_start_time)) / 86400, 
    2161         ((long)difftime(mudtime, globals.first_start_time) % 86400) / 3600, 
    2162         (((long)difftime(mudtime, globals.first_start_time) % 86400) % 3600) / 60, 
    2163         (((long)difftime(mudtime, globals.first_start_time) % 86400) % 3600) % 60); 
     2160        ((long) difftime(mudtime, globals.first_start_time)) / 86400, 
     2161        ((long) difftime(mudtime, globals.first_start_time) % 86400) / 
     2162        3600, 
     2163        (((long) difftime(mudtime, globals.first_start_time) % 86400) % 
     2164         3600) / 60, 
     2165        (((long) difftime(mudtime, globals.first_start_time) % 86400) % 
     2166         3600) % 60); 
    21642167 
    21652168  /* Mortals, go no further! */ 

  • 1.8.2/branches/devel/src/move.c

    r814 r816  
    11751175  strcpy(flwr, unparse_dbref(follower)); 
    11761176  strcpy(tbuf1, atr_value(a)); 
    1177   (void) atr_add(leader, "FOLLOWERS", 
    1178          remove_word(tbuf1, flwr, ' '), GOD, 0); 
     1177  (void) atr_add(leader, "FOLLOWERS", remove_word(tbuf1, flwr, ' '), GOD, 0); 
    11791178} 
    11801179 
    …… 
    11921191  strcpy(ldr, unparse_dbref(leader)); 
    11931192  strcpy(tbuf1, atr_value(a)); 
    1194   (void) atr_add(follower, "FOLLOWING", 
    1195          remove_word(tbuf1, ldr, ' '), GOD, 0); 
     1193  (void) atr_add(follower, "FOLLOWING", remove_word(tbuf1, ldr, ' '), GOD, 0); 
    11961194} 
    11971195 

  • 1.8.2/branches/devel/src/parse.c

    r793 r816  
    812812        goto exit_sequence; 
    813813      (*str)++; 
    814       if (!isdigit((unsigned char)nextc)) { 
     814      if (!isdigit((unsigned char) nextc)) { 
    815815        safe_str(T(e_int), buff, bp); 
    816816        break; 

  • 1.8.2/branches/devel/src/portmsg.c

    r736 r816  
    9797const char *host_ip = SINGLE_IP_ADDR 
    9898#endif 
    99  
    100 static void wait_on_child(int sig); 
    101 static void lostconn(int sig) NORETURN; 
    102  
    103 enum { MAX_CONNECTIONS = 15 }; 
    104 int connections = 0; 
    105  
     99  static void wait_on_child(int sig); 
    106100static void 
    107 wait_on_child(int sig __attribute__ ((__unused__))) 
     101lostconn(int sig) 
     102  NORETURN; 
     103 
     104    enum { MAX_CONNECTIONS = 15 }; 
     105    int connections = 0; 
     106 
     107    static void 
     108     wait_on_child(int sig __attribute__ ((__unused__))) 
    108109{ 
    109110  WAIT_TYPE status; 
    110111 
    111112#ifdef HAS_WAITPID 
    112   while (waitpid(-1, &status, WNOHANG) > 0)  
     113  while (waitpid(-1, &status, WNOHANG) > 0) 
    113114    connections--; 
    114115#else 
    115   while (wait3(&status, WNOHANG, NULL) > 0)  
     116  while (wait3(&status, WNOHANG, NULL) > 0) 
    116117    connections--; 
    117118#endif 
    …… 
    147148  if (port == 0) { 
    148149    fprintf(stderr, "error: bad port number [%s]\n", argv[2]); 
    149     return 1 ; 
     150    return 1; 
    150151  } 
    151152  if ((msgfd = open(argv[1], O_RDONLY)) < 0) { 
    152153    fprintf(stderr, "error: cannot open message file [%s]: %s\n", argv[1], 
    153154        strerror(errno)); 
    154     return 1 ; 
     155    return 1; 
    155156  } 
    156157  /* read the message */ 
    …… 
    163164  if (read(msgfd, msg, statBuf.st_size) != statBuf.st_size) { 
    164165    fprintf(stderr, "error: cannot read message file [%s]\n", argv[1]); 
    165     return 1 ; 
     166    return 1; 
    166167  } 
    167168 

  • 1.8.2/branches/devel/src/rob.c

    r793 r816  
    227227    if (!a) 
    228228      continue; 
    229     strncpy(prices,atr_value(a),BUFFER_LEN); 
    230     prices[BUFFER_LEN-1] = '\0'; 
     229    strncpy(prices, atr_value(a), BUFFER_LEN); 
     230    prices[BUFFER_LEN - 1] = '\0'; 
    231231    upcasestr(prices); 
    232232    count = list2arr(r, BUFFER_LEN / 2, prices, ' '); 
    …… 
    549549    return; 
    550550  } 
    551   while ((s > arg) && isspace((unsigned char)*(s - 1))) { 
     551  while ((s > arg) && isspace((unsigned char) *(s - 1))) { 
    552552    s--; 
    553553  } 
    …… 
    559559  s = (char *) string_match(s, "TO "); 
    560560  s += 3; 
    561   while (*s && isspace((unsigned char)*s)) 
     561  while (*s && isspace((unsigned char) *s)) 
    562562    s++; 
    563563  if (!*s) { 

  • 1.8.2/branches/devel/src/set.c

    r814 r816  
    10981098  case AE_TREE: 
    10991099    notify_format(player, 
    1100           T("Attribute %s cannot be wiped because a child attribute cannot be wiped."), 
     1100          T 
     1101          ("Attribute %s cannot be wiped because a child attribute cannot be wiped."), 
    11011102          AL_NAME(atr)); 
    11021103    /* Fall through */ 
    …… 
    11401141  } 
    11411142 
    1142   switch ((wiped = 
    1143        atr_iter_get(player, thing, pattern, 0, wipe_helper, NULL))) { 
     1143  switch ((wiped = atr_iter_get(player, thing, pattern, 0, wipe_helper, NULL))) { 
    11441144  case 0: 
    11451145    notify(player, T("No attributes wiped.")); 

  • 1.8.2/branches/devel/src/wiz.c

    r814 r816  
    201201    limit = owned; 
    202202 
    203   (void) atr_add(Owner(who), "RQUOTA", tprintf("%d", limit - owned), GOD, 
    204          0); 
     203  (void) atr_add(Owner(who), "RQUOTA", tprintf("%d", limit - owned), GOD, 0); 
    205204 
    206205  notify_format(player, T("Objects: %d   Limit: %d"), owned, limit); 
    …… 
    267266    (void) atr_add(who, "RQUOTA", "0", GOD, 0); 
    268267      else 
    269     (void) atr_add(who, "RQUOTA", tprintf("%d", limit - owned), GOD, 
    270                0); 
     268    (void) atr_add(who, "RQUOTA", tprintf("%d", limit - owned), GOD, 0); 
    271269    } 
    272270  } 
    …… 
    18251823    /* A special old-timey kludge */ 
    18261824    if (class && !*class && restriction && *restriction) { 
    1827       if (isdigit((unsigned char)*restriction) || ((*restriction == '#') && *(restriction + 1) 
    1828                            && isdigit((unsigned char)*(restriction + 1)))) { 
     1825      if (isdigit((unsigned char) *restriction) 
     1826      || ((*restriction == '#') && *(restriction + 1) 
     1827          && isdigit((unsigned char) *(restriction + 1)))) { 
    18291828    size_t offset = 0; 
    18301829    if (*restriction == '#') 
    …… 
    18381837    if (!class || !*class || !restriction) 
    18391838      continue; 
    1840     if (isdigit((unsigned char)*class) || 
    1841     ((*class == '#') && *(class + 1) && isdigit((unsigned char)*(class + 1)))) { 
     1839    if (isdigit((unsigned char) *class) || 
     1840    ((*class == '#') && *(class + 1) 
     1841     && isdigit((unsigned char) *(class + 1)))) { 
    18421842      size_t offset = 0; 
    18431843      if (*class == '#') 
    …… 
    18461846      if (!GoodObject(spec->low)) 
    18471847    spec->low = 0; 
    1848       if (isdigit((unsigned char)*restriction) || ((*restriction == '#') && *(restriction + 1) 
    1849                            && isdigit((unsigned char)*(restriction + 1)))) { 
     1848      if (isdigit((unsigned char) *restriction) 
     1849      || ((*restriction == '#') && *(restriction + 1) 
     1850          && isdigit((unsigned char) *(restriction + 1)))) { 
    18501851    offset = 0; 
    18511852    if (*restriction == '#') 

  • 1.8.2/branches/devel/utils/mkvershlp.pl

    r423 r816  
    1 #!/usr/local/bin/perl 
     1#!/usr/bin/env perl 
    22# 
    33# Generate game/txt/hlp/ files from the CHANGES file(s).