PennMUSH Community

Changeset 1159

Show
Ignore:
Timestamp:
11/22/07 12:53:02 (10 months ago)
Author:
shawnw
Message:

Ran make indent

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • 1.8.3/branches/devel/hdrs/ansi.h

    r1143 r1159  
    9090} ansi_data; 
    9191 
    92 int read_raw_ansi_data(ansi_data * store, const char *codes); 
    93 int write_raw_ansi_data(ansi_data * old, ansi_data * cur, char *buff, 
    94                         char **bp); 
     92int read_raw_ansi_data(ansi_data *store, const char *codes); 
     93int write_raw_ansi_data(ansi_data *old, ansi_data *cur, char *buff, char **bp); 
    9594 
    96 void define_ansi_data(ansi_data * store, const char *str); 
    97 int write_ansi_data(ansi_data * cur, char *buff, char **bp); 
     95void define_ansi_data(ansi_data *store, const char *str); 
     96int write_ansi_data(ansi_data *cur, char *buff, char **bp); 
    9897 
    9998 
    100 void nest_ansi_data(ansi_data * old, ansi_data * cur); 
     99void nest_ansi_data(ansi_data *old, ansi_data *cur); 
    101100 
    102101#define MARKUP_COLOR 'c' 

  • 1.8.3/branches/devel/hdrs/shs.h

    r964 r1159  
    4040} SHS_INFO; 
    4141 
    42 void shsInit(SHS_INFO * shsInfo); 
    43 void shsUpdate(SHS_INFO * shsInfo, const BYTE *buffer, int count); 
    44 void shsFinal(SHS_INFO * shsInfo); 
     42void shsInit(SHS_INFO *shsInfo); 
     43void shsUpdate(SHS_INFO *shsInfo, const BYTE *buffer, int count); 
     44void shsFinal(SHS_INFO *shsInfo); 
    4545#endif 

  • 1.8.3/branches/devel/src/Makefile.in

    r1143 r1159  
    148148    (set +e; for file in *.dst *.c  ../hdrs/*.h ; do echo $$file; \ 
    149149    @INDENT@ -npro -kr -ci2 -ss -psl -ip4 -i2 -cs -l80 -lc75 -nut \ 
    150     -T acsflag -T aig_func -T ALIST -T ansi_string -T ATRALIAS -T ATTR \ 
    151     -T BOOL -T bool -T boolexp -T boolexp_type -T BQUE -T branch_chain \ 
    152     -T BUFFERQ -T bvm_opcode -T BYTE -T CDESC -T CHAN -T CHANLIST \ 
    153     -T CHANUSER -T chunk_reference_t -T CNode -T COMLIST \ 
    154     -T command_func -T COMMAND_INFO -T comp_func -T compile_data \ 
    155     -T COMSORTSTRUC -T config_func -T CType -T dbref -T Debug_Info \ 
    156     -T DESC -T dfa_match_data -T eptrblock -T EVAL_CONTEXT -T FBLOCK \ 
    157     -T fd_type -T FLAG -T FLAG_ALIAS -T FLAGSPACE -T folder_array \ 
    158     -T FUN -T function_func -T FUNTAB -T GLOBALTAB -T HASHENT \ 
    159     -T HASHTAB -T heapframe -T IVAL -T list_type_list -T lock_list \ 
    160     -T lock_type -T LOCKMSGINFO -T LONG -T MAIL -T mail_flag \ 
    161     -T makerecord -T markup_information -T match_data -T MATH -T MEM \ 
    162     -T na_lookup -T NVAL -T object_flag_type -T OPTTAB \ 
    163     -T pcre_study_data -T pcre_uint16 -T pcre_uint32 -T PE_Info \ 
    164     -T PENNCONF -T PENNCONFGROUP -T Port_t -T PRIV -T privbits \ 
    165     -T PTAB -T ptab_entry -T qsort_func -T real_pcre \ 
    166     -T recursion_info -T Region -T RegionHeader -T s_rec -T slab \ 
    167     -T sqlplatform -T StrNode -T StrTree -T switch_mask \ 
    168     -T SWITCH_VALUE -T tcheck -T tlist -T UIVAL -T uschar -T UsedAttr \ 
    169     -T USERFN_ENTRY -T WAIT_TYPE -T warn_type -T Word \ 
     150    -T _Bool -T accent_info -T acsflag -T aig_func -T ALIST \ 
     151        -T ansi_data -T ansi_string -T atr_err -T ATRALIAS -T ATTR \ 
     152        -T BOOL -T boolexp -T boolexp_type -T BQUE -T branch_chain \ 
     153        -T BUFFERQ -T bvm_opcode -T BYTE -T CHAN -T CHANLIST -T CHANUSER \ 
     154        -T chunk_reference_t -T CNode -T COMLIST -T command_func \ 
     155        -T COMMAND_INFO -T comp_func -T compile_data -T COMSORTSTRUC \ 
     156        -T config_func -T CType -T dbref -T Debug_Info -T DESC \ 
     157        -T dfa_match_data -T eptrblock -T EVAL_CONTEXT -T FBLOCK \ 
     158        -T fd_type -T FLAG -T FLAG_ALIAS -T FLAGSPACE -T folder_array \ 
     159        -T Free_t -T FUN -T function_func -T FUNTAB -T GLOBALTAB \ 
     160        -T hash_func -T HASHENT -T HASHTAB -T heapframe -T help_file \ 
     161        -T help_indx -T ident_t -T imaxdiv_t -T IVAL -T list_type_list \ 
     162        -T lock_list -T lock_type -T LOCKMSGINFO -T LONG -T ltype -T MAIL \ 
     163        -T mail_flag -T makerecord -T Malloc_t -T markup_information \ 
     164        -T match_data -T MATH -T MEM -T na_lookup -T NVAL \ 
     165        -T object_flag_type -T OPTTAB -T pcre_study_data -T pcre_uint16 \ 
     166        -T pcre_uint32 -T PE_Info -T PENNCONF -T PENNCONFGROUP -T Port_t \ 
     167        -T PRIV -T privbits -T PTAB -T ptab_entry -T qsort_func \ 
     168        -T real_pcre -T recursion_info -T Region -T RegionHeader -T s_rec \ 
     169        -T SHS_INFO -T slab -T sqlplatform -T StrNode -T StrTree \ 
     170        -T switch_mask -T SWITCH_VALUE -T tcheck -T tlist \ 
     171        -T ucp_type_table -T UIVAL -T uschar -T UsedAttr -T USERFN_ENTRY \ 
     172        -T WAIT_TYPE -T warn_type -T Word \ 
    170173    $$file ; done) 
    171174 

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

    r1143 r1159  
    21012101{ 
    21022102  if (*userstring) { 
    2103     mush_free((Malloc_t) * userstring, "userstring"); 
     2103    mush_free((Malloc_t) *userstring, "userstring"); 
    21042104    *userstring = NULL; 
    21052105  } 

  • 1.8.3/branches/devel/src/csrimalloc.c

    r964 r1159  
    998998univptr_t 
    999999erealloc(univptr_t ptr, size_t nbytes); 
    1000 Free_t 
    1001 free(univptr_t cp); 
    1002 Free_t 
    1003 cfree(univptr_t cp); 
     1000    Free_t 
     1001     free(univptr_t cp); 
     1002    Free_t 
     1003     cfree(univptr_t cp); 
    10041004#endif                          /* CSRI_TRACE */ 
    10051005 

  • 1.8.3/branches/devel/src/fundb.c

    r964 r1159  
    12241224  ltype = get_locktype(p); 
    12251225 
    1226   if (GoodObject(it) && (ltype != NULL) 
    1227       && Can_Read_Lock(executor, it, ltype)) { 
     1226  if (GoodObject(it) && (ltype !=NULL) 
     1227      &&Can_Read_Lock(executor, it, ltype)) { 
    12281228    ll = getlockstruct(it, ltype); 
    12291229    if (ll) { 
    …… 
    12631263 
    12641264  if ((ltype = strchr(args[0], '/'))) { 
    1265     *ltype++ = '\0'; 
     1265    *ltype ++ = '\0'; 
    12661266    upcasestr(ltype); 
    12671267  } 
    …… 
    13071307  ltype = get_locktype(p); 
    13081308 
    1309   if (!GoodObject(it) || (ltype == NULL) || !Can_Read_Lock(executor, it, ltype)) { 
     1309  if (!GoodObject(it) || (ltype == NULL) ||!Can_Read_Lock(executor, it, ltype)) { 
    13101310    safe_str("#-1", buff, bp); 
    13111311    return; 

  • 1.8.3/branches/devel/src/help.c

    r1157 r1159  
    2929static int help_init = 0; 
    3030 
    31 static void do_new_spitfile(dbref player, char *arg1, help_file * help_dat); 
    32 static const char *string_spitfile(help_file * help_dat, char *arg1); 
    33 static help_indx *help_find_entry(help_file * help_dat, const char *the_topic); 
    34 static char** list_matching_entries(const char *pattern, 
    35                    help_file *help_dat, int *len); 
     31static void do_new_spitfile(dbref player, char *arg1, help_file *help_dat); 
     32static const char *string_spitfile(help_file *help_dat, char *arg1); 
     33static help_indx *help_find_entry(help_file *help_dat, const char *the_topic); 
     34static char **list_matching_entries(const char *pattern, 
     35                                    help_file *help_dat, int *len); 
    3636static void free_entry_list(char **); 
    37 static const char *normalize_entry(help_file * help_dat, const char *arg1); 
    38  
    39 static void help_build_index(help_file * h, int restricted); 
     37static const char *normalize_entry(help_file *help_dat, const char *arg1); 
     38 
     39static void help_build_index(help_file *h, int restricted); 
    4040 
    4141/** Linked list of help topic names. */ 
    …… 
    7676    if (len == 0) 
    7777      notify_format(player, T("No entries matching '%s' were found."), 
    78            arg_left); 
     78                    arg_left); 
    7979    else if (len == 1) 
    8080      do_new_spitfile(player, *entries, h); 
    …… 
    8787      *bp = '\0'; 
    8888      notify_format(player, T("Here are the entries which match '%s':\n%s"), 
    89            arg_left, buff); 
     89                    arg_left, buff); 
    9090    } 
    9191    free_entry_list(entries); 
    …… 
    176176 
    177177static void 
    178 do_new_spitfile(dbref player, char *arg1, help_file * help_dat) 
     178do_new_spitfile(dbref player, char *arg1, help_file *help_dat) 
    179179{ 
    180180  help_indx *entry = NULL; 
    …… 
    260260 
    261261static help_indx * 
    262 help_find_entry(help_file * help_dat, const char *the_topic) 
     262help_find_entry(help_file *help_dat, const char *the_topic) 
    263263{ 
    264264  help_indx *entry = NULL; 
    …… 
    349349 
    350350static void 
    351 help_build_index(help_file * h, int restricted) 
     351help_build_index(help_file *h, int restricted) 
    352352{ 
    353353  long bigpos, pos = 0; 
    …… 
    512512 
    513513static const char * 
    514 normalize_entry(help_file * help_dat, const char *arg1) 
     514normalize_entry(help_file *help_dat, const char *arg1) 
    515515{ 
    516516  static char the_topic[LINE_SIZE + 2]; 
    …… 
    528528 
    529529static const char * 
    530 string_spitfile(help_file * help_dat, char *arg1) 
     530string_spitfile(help_file *help_dat, char *arg1) 
    531531{ 
    532532  help_indx *entry = NULL; 
    …… 
    595595    } else { 
    596596      *len = 1; 
    597       buff = mush_malloc(sizeof(char**), "help.search"); 
     597      buff = mush_malloc(sizeof(char **), "help.search"); 
    598598      *buff = entry->topic + offset; 
    599599      return buff; 
    …… 
    601601  } 
    602602 
    603   buff = mush_calloc(help_dat->entries, sizeof(char*), "help.search"); 
     603  buff = mush_calloc(help_dat->entries, sizeof(char *), "help.search"); 
    604604  *len = 0; 
    605605 
    …… 
    614614 
    615615static void 
    616 free_entry_list(char **entries)  
     616free_entry_list(char **entries) 
    617617{ 
    618618  if (entries) 

  • 1.8.3/branches/devel/src/ident.c

    r1144 r1159  
    7777                        struct sockaddr *laddr, socklen_t llen, int *timeout); 
    7878 
    79 static int id_query(ident_t * id, 
     79static int id_query(ident_t *id, 
    8080                    struct sockaddr *laddr, 
    8181                    socklen_t llen, 
    8282                    struct sockaddr *faddr, socklen_t flen, int *timeout); 
    8383 
    84 static void id_close(ident_t * id); 
    85  
    86 static int id_parse(ident_t * id, int *timeout, IDENT ** ident); 
     84static void id_close(ident_t *id); 
     85 
     86static int id_parse(ident_t *id, int *timeout, IDENT ** ident); 
    8787static IDENT *ident_lookup(int fd, int *timeout); 
    8888 
    …… 
    255255 
    256256static void 
    257 id_close(ident_t * id) 
     257id_close(ident_t *id) 
    258258{ 
    259259  closesocket(id->fd); 
    …… 
    269269 
    270270static int 
    271 id_query(ident_t * id, struct sockaddr *laddr, socklen_t llen, 
     271id_query(ident_t *id, struct sockaddr *laddr, socklen_t llen, 
    272272         struct sockaddr *faddr, socklen_t flen, int *timeout) 
    273273{ 
    …… 
    390390 
    391391static int 
    392 id_parse(ident_t * id, int *timeout, IDENT ** ident) 
     392id_parse(ident_t *id, int *timeout, IDENT ** ident) 
    393393{ 
    394394  char c, *cp, *tmp_charset = NULL; 

  • 1.8.3/branches/devel/src/lock.c

    r1051 r1159  
    878878  for (lm = lock_msgs; lm->type; lm++) { 
    879879    if (!strcmp(lm->type, ltype)) 
    880       break; 
     880      break; 
    881881  } 
    882882  if (lm->type) { 

  • 1.8.3/branches/devel/src/markup.c

    r1085 r1159  
    401401 
    402402int 
    403 write_ansi_data(ansi_data * cur, char *buff, char **bp) 
     403write_ansi_data(ansi_data *cur, char *buff, char **bp) 
    404404{ 
    405405  int retval = 0; 
    …… 
    465465 
    466466void 
    467 nest_ansi_data(ansi_data * old, ansi_data * cur) 
     467nest_ansi_data(ansi_data *old, ansi_data *cur) 
    468468{ 
    469469  if (cur->fore != 'n') { 
    …… 
    484484#define EDGE_UP(x,y,z) ((x.bits & z) != (y->bits & z)) 
    485485int 
    486 write_raw_ansi_data(ansi_data * old, ansi_data * cur, char *buff, char **bp) 
     486write_raw_ansi_data(ansi_data *old, ansi_data *cur, char *buff, char **bp) 
    487487{ 
    488488  int f = 0; 
    …… 
    556556 
    557557void 
    558 define_ansi_data(ansi_data * store, const char *str) 
     558define_ansi_data(ansi_data *store, const char *str) 
    559559{ 
    560560  *store = ansi_null; 
    …… 
    625625 
    626626int 
    627 read_raw_ansi_data(ansi_data * store, const char *codes) 
     627read_raw_ansi_data(ansi_data *store, const char *codes) 
    628628{ 
    629629  int curnum; 

  • 1.8.3/branches/devel/src/notify.c

    r1052 r1159  
    184184static void free_strings(struct notify_strings messages[]); 
    185185static void zero_strings(struct notify_strings messages[]); 
    186 static int output_ansichange(ansi_data * states, int *ansi_ptr, 
     186static int output_ansichange(ansi_data *states, int *ansi_ptr, 
    187187                             const unsigned char **ptr, char *buff, char **bp); 
    188188static unsigned char *notify_makestring(const char *message, 
    …… 
    211211 
    212212static int 
    213 output_ansichange(ansi_data * states, int *ansi_ptr, 
     213output_ansichange(ansi_data *states, int *ansi_ptr, 
    214214                  const unsigned char **ptr, char *buff, char **bp) 
    215215{ 

  • 1.8.3/branches/devel/src/shs.c

    r964 r1159  
    117117 */ 
    118118void 
    119 shsInit(SHS_INFO * shsInfo) 
     119shsInit(SHS_INFO *shsInfo) 
    120120{ 
    121121  /* Set the h-vars to their initial values */ 
    …… 
    132132 
    133133 
    134 static void shsTransform(SHS_INFO * shsInfo); 
     134static void shsTransform(SHS_INFO *shsInfo); 
    135135 
    136136/* Perform the SHS transformation. Note that this code, like MD5, seems to 
    …… 
    139139 */ 
    140140static void 
    141 shsTransform(SHS_INFO * shsInfo) 
     141shsTransform(SHS_INFO *shsInfo) 
    142142{ 
    143143  LONG W[80], temp; 
    …… 
    342342 */ 
    343343void 
    344 shsUpdate(SHS_INFO * shsInfo, const BYTE *buffer, int count) 
     344shsUpdate(SHS_INFO *shsInfo, const BYTE *buffer, int count) 
    345345{ 
    346346  /* Update bitcount */ 
    …… 
    373373 */ 
    374374void 
    375 shsFinal(SHS_INFO * shsInfo) 
     375shsFinal(SHS_INFO *shsInfo) 
    376376{ 
    377377  int count;