Permalink
Browse files

Prep work for p9: make indent, bump versions, etc.

git-svn-id: https://pennmush.googlecode.com/svn/trunk@1337 ba372814-4f39-11de-9ad6-1127a62b9fcd
  • Loading branch information...
allthecoolkidshaveone
allthecoolkidshaveone committed Feb 3, 2012
1 parent 5f25a56 commit 98087a66fe8c44dd15654a0cd756df347b19f588
Showing with 207 additions and 173 deletions.
  1. +1 −1 CHANGES.184
  2. +1 −1 HACKING.184
  3. +1 −1 Makefile.in
  4. +1 −1 Patchlevel
  5. +1 −1 game/txt/hlp/pennv184.hlp
  6. +3 −3 hdrs/SFMT.h
  7. +1 −1 hdrs/access.h
  8. +1 −1 hdrs/ansi.h
  9. +1 −1 hdrs/bufferq.h
  10. +2 −3 hdrs/dbio.h
  11. +22 −20 hdrs/externs.h
  12. +2 −1 hdrs/extmail.h
  13. +9 −14 hdrs/match.h
  14. +1 −1 hdrs/mushtype.h
  15. +1 −1 hdrs/mysocket.h
  16. +7 −7 hdrs/myssl.h
  17. +2 −2 hdrs/sort.h
  18. +1 −1 hdrs/svninfo.h
  19. +3 −3 hdrs/version.h
  20. +4 −4 src/SFMT.c
  21. +2 −2 src/access.c
  22. +6 −2 src/attrib.c
  23. +2 −2 src/boolexp.c
  24. +4 −2 src/bsd.c
  25. +1 −2 src/bufferq.c
  26. +2 −1 src/command.c
  27. +19 −11 src/cque.c
  28. +2 −2 src/db.c
  29. +9 −9 src/extmail.c
  30. +6 −3 src/flags.c
  31. +12 −13 src/funcrypt.c
  32. +6 −5 src/funmisc.c
  33. +1 −1 src/htab.c
  34. +2 −3 src/lock.c
  35. +1 −1 src/markup.c
  36. +9 −5 src/mycrypt.c
  37. +1 −1 src/mysocket.c
  38. +7 −8 src/myssl.c
  39. +14 −14 src/player.c
  40. +2 −1 src/predicat.c
  41. +2 −2 src/sort.c
  42. +5 −5 src/sql.c
  43. +1 −1 src/strutil.c
  44. +4 −2 src/timer.c
  45. +2 −2 src/utils.c
  46. +3 −0 src/wild.c
  47. +17 −5 src/wiz.c
View
@@ -16,7 +16,7 @@ chronological order (most recent first)
==========================================================================
Version 1.8.4 patchlevel 9 ??? ??, 2012
Version 1.8.4 patchlevel 9 Feb 05, 2012
Major changes:
* The PCRE library is now required to build Penn, instead of falling
View
@@ -20,7 +20,7 @@ that have altered hardcode will appear here.
==========================================================================
Version 1.8.4 patchlevel 8 ??? ??, 2011
Version 1.8.4 patchlevel 8 Nov 11, 2011
command_check_byname() and command_check_byname_quiet() now both take
an additional NEW_PE_INFO *pe_info arg, used for evaluating the
View
@@ -3,7 +3,7 @@
# - System configuration - #
VERSION=1.8.4
PATCHLEVEL=8
PATCHLEVEL=9
#
# This section of the file should be automatically configured by the
View
@@ -1,3 +1,3 @@
Do not edit this file. It is maintained by the official PennMUSH patches.
This is PennMUSH 1.8.4p8
This is PennMUSH 1.8.4p9
@@ -11,7 +11,7 @@ help topics named for each release (e.g. 'help 1.7.2p30').
A list of the patchlevels associated with each release can
be read in 'help patchlevels'.
Version 1.8.4 patchlevel 9 ??? ??, 2012
Version 1.8.4 patchlevel 9 Feb 05, 2012
Major changes:
* The PCRE library is now required to build Penn, instead of falling
View
@@ -72,10 +72,10 @@
uint32_t gen_rand32(void);
uint64_t gen_rand64(void);
void fill_array32(uint32_t * array, int size);
void fill_array64(uint64_t * array, int size);
void fill_array32(uint32_t *array, int size);
void fill_array64(uint64_t *array, int size);
void init_gen_rand(uint32_t seed);
void init_by_array(uint32_t * init_key, int key_length);
void init_by_array(uint32_t *init_key, int key_length);
const char *get_idstring(void);
int get_min_array_size32(void);
int get_min_array_size64(void);
View
@@ -63,6 +63,6 @@ bool add_access_sitelock(dbref player, const char *host, dbref who,
int remove_access_sitelock(const char *pattern);
void do_list_access(dbref player);
int parse_access_options
(const char *opts, dbref *who, uint32_t * can, uint32_t * cant, dbref player);
(const char *opts, dbref *who, uint32_t *can, uint32_t *cant, dbref player);
#endif /* __ACCESS_H */
View
@@ -171,7 +171,7 @@ typedef struct _ansi_string {
#define AS_IsOptimized(as) AS_IS(as, AS_OPTIMIZED) /**< Has the ansi_string been optimized */
int ansi_strcmp(const char *astr, const char *bstr);
char *remove_markup(const char *orig, size_t * stripped_len);
char *remove_markup(const char *orig, size_t *stripped_len);
char *skip_leading_ansi(const char *p);
int has_markup(const char *test);
View
@@ -32,7 +32,7 @@ BUFFERQ *reallocate_bufferq(BUFFERQ *bq, int lines);
void free_bufferq(BUFFERQ *bq);
void add_to_bufferq(BUFFERQ *bq, int type, dbref player, const char *msg);
char *iter_bufferq(BUFFERQ *bq, char **p, dbref *player, int *type,
time_t * timestamp);
time_t *timestamp);
int bufferq_lines(BUFFERQ *bq);
int bufferq_blocks(BUFFERQ *bq);
bool isempty_bufferq(BUFFERQ *bq);
View
@@ -59,10 +59,9 @@ long getref(PENNFILE *f);
void db_read_this_labeled_string(PENNFILE *f, const char *label, char **val);
void db_read_labeled_string(PENNFILE *f, char **label, char **val);
void db_read_this_labeled_int(PENNFILE *f, const char *label, int *val);
void db_read_this_labeled_uint32(PENNFILE *f, const char *lable,
uint32_t * val);
void db_read_this_labeled_uint32(PENNFILE *f, const char *lable, uint32_t *val);
void db_read_labeled_int(PENNFILE *f, char **label, int *val);
void db_read_labeled_uint32(PENNFILE *f, char **label, uint32_t * val);
void db_read_labeled_uint32(PENNFILE *f, char **label, uint32_t *val);
void db_read_this_labeled_dbref(PENNFILE *f, const char *label, dbref *val);
void db_read_labeled_dbref(PENNFILE *f, char **label, dbref *val);
View
@@ -408,8 +408,8 @@ bool password_check(dbref player, const char *password);
dbref lookup_player(const char *name);
dbref lookup_player_name(const char *name);
/* from player.c */
dbref create_player(DESC *d, dbref executor, const char *name, const char *password,
const char *host, const char *ip);
dbref create_player(DESC *d, dbref executor, const char *name,
const char *password, const char *host, const char *ip);
dbref connect_player(DESC *d, const char *name, const char *password,
const char *host, const char *ip, char *errbuf);
void check_last(dbref player, const char *host, const char *ip);
@@ -603,30 +603,32 @@ mush_strndup(const char *src, size_t len, const char *check)
/* Append len characters of a string to a buffer */
int safe_strl(const char *s, size_t len, char *buff, char **bp);
/* Append a base16 encoded block of bytes to a buffer */
int safe_hexstr(uint8_t *data, int len, char *buff, char **bp);
int safe_hexstr(uint8_t *data, int len, char *buff, char **bp);
/** Append a boolean to the end of a string */
#define safe_boolean(x, buf, bufp) \
safe_chr((x) ? '1' : '0', (buf), (bufp))
static inline int
safe_time_t(time_t t, char *buff, char **bp)
static inline int
safe_time_t(time_t t, char *buff, char **bp)
{
return safe_integer((intmax_t) t, buff, bp);
}
/* Append N copies of the character X to the end of a string */
int safe_fill(char x, size_t n, char *buff, char **bp);
int safe_fill(char x, size_t n, char *buff, char **bp);
/* Append an accented string */
int safe_accent(const char *restrict base,
const char *restrict tmplate, size_t len, char *buff,
char **bp);
char *mush_strncpy(char *restrict, const char *, size_t);
char *replace_string
(const char *restrict old, const char *restrict newbit,
const char *restrict string) __attribute_malloc__;
char *replace_string2(const char *old[2], const char *newbits[2],
const char *restrict string)
__attribute_malloc__;
int safe_accent(const char *restrict base,
const char *restrict tmplate, size_t len, char *buff,
char **bp);
char *mush_strncpy(char *restrict, const char *, size_t);
char *replace_string
(const char *restrict old, const char *restrict newbit,
const char *restrict string) __attribute_malloc__;
char *
replace_string2(const char *old[2], const char *newbits[2],
const char *restrict string)
__attribute_malloc__;
extern const char *standard_tokens[2]; /* ## and #@ */
char *copy_up_to(char *RESTRICT dest, const char *RESTRICT src, char c);
char *trim_space_sep(char *str, char sep);
@@ -702,8 +704,8 @@ safe_time_t(time_t t, char *buff, char **bp)
#define UFUN_NAME_NOSPACE 0x40
#define UFUN_DEFAULT (UFUN_OBJECT | UFUN_LAMBDA)
bool fetch_ufun_attrib(const char *attrstring, dbref executor,
ufun_attrib *ufun, int flags);
bool call_ufun(ufun_attrib *ufun, char *ret, dbref caller,
ufun_attrib * ufun, int flags);
bool call_ufun(ufun_attrib * ufun, char *ret, dbref caller,
dbref enactor, NEW_PE_INFO *pe_info, PE_REGS *pe_regs);
bool call_attrib(dbref thing, const char *attrname, char *ret,
dbref enactor, NEW_PE_INFO *pe_info, PE_REGS *pe_regs);
View
@@ -96,7 +96,8 @@ extern void do_mail_unfolder(dbref player, char *fld);
extern void do_mail_list(dbref player, const char *msglist);
extern void do_mail_read(dbref player, char *msglist);
extern void do_mail_review(dbref player, const char *name, const char *msglist);
extern void do_mail_retract(dbref player, const char *name, const char *msglist);
extern void do_mail_retract(dbref player, const char *name,
const char *msglist);
extern void do_mail_clear(dbref player, const char *msglist);
extern void do_mail_unclear(dbref player, const char *msglist);
extern void do_mail_unread(dbref player, const char *msglist);
View
@@ -60,24 +60,19 @@
/* Functions we can call */
extern dbref
dbref
match_result(dbref who, const char *xname, int type, long flags);
extern dbref
match_result_relative(dbref who, dbref where, const char *xname, int type,
dbref
match_result_relative(dbref who, dbref where, const char *xname, int type,
long flags);
extern dbref noisy_match_result(const dbref who, const char *name,
const int type, const long flags);
extern dbref last_match_result(const dbref who, const char *name,
const int type, const long flags);
extern dbref match_controlled(dbref player, const char *name);
dbref noisy_match_result(const dbref who, const char *name,
const int type, const long flags);
dbref last_match_result(const dbref who, const char *name,
const int type, const long flags);
dbref match_controlled(dbref player, const char *name);
extern int match_aliases(dbref match, const char *name);
int match_aliases(dbref match, const char *name);
#define match_thing(player,name) \
noisy_match_result((player), (name), NOTYPE, MAT_EVERYTHING)
View
@@ -333,7 +333,7 @@ typedef enum conn_status {
CONN_DENIED /* connection denied due to login limits/sitelock */
} conn_status;
typedef bool(*sq_func) (void *);
typedef bool (*sq_func) (void *);
struct squeue {
sq_func fun;
void *data;
View
@@ -68,7 +68,7 @@ struct hostname_info *ip_convert(struct sockaddr *host, int len);
/* Open a socket for listening */
int make_socket
(Port_t port, int socktype, union sockaddr_u *addr, socklen_t * len,
(Port_t port, int socktype, union sockaddr_u *addr, socklen_t *len,
const char *host);
/* Connect somewhere using TCP */
int make_socket_conn(const char *host, int socktype,
View
@@ -11,22 +11,22 @@
SSL_CTX *ssl_init(char *private_key_file, char *ca_file, int req_client_cert);
SSL *ssl_setup_socket(int sock);
void ssl_close_connection(SSL * ssl);
void ssl_close_connection(SSL *ssl);
SSL *ssl_alloc_struct(void);
SSL *ssl_listen(int sock, int *state);
SSL *ssl_resume(int sock, int *state);
int ssl_accept(SSL * ssl);
int ssl_handshake(SSL * ssl);
int ssl_accept(SSL *ssl);
int ssl_handshake(SSL *ssl);
int ssl_need_accept(int state);
int ssl_need_handshake(int state);
int ssl_want_write(int state);
int ssl_read(SSL * ssl, int state, int net_read_ready, int net_write_ready,
int ssl_read(SSL *ssl, int state, int net_read_ready, int net_write_ready,
char *buf, int bufsize, int *bytes_read);
int ssl_write(SSL * ssl, int state, int net_read_ready, int net_write_ready,
int ssl_write(SSL *ssl, int state, int net_read_ready, int net_write_ready,
unsigned char *buf, int bufsize, int *offset);
void ssl_write_session(FILE * fp, SSL * ssl);
void ssl_write_session(FILE * fp, SSL *ssl);
void ssl_read_session(FILE * fp);
void ssl_write_ssl(FILE * fp, SSL * ssl);
void ssl_write_ssl(FILE * fp, SSL *ssl);
SSL *ssl_read_ssl(FILE * fp, int sock);
#endif /* _MYSSL_H */
View
@@ -71,7 +71,7 @@ void do_gensort(dbref player, char *keys[], char *strs[], int n,
typedef int (*comp_func) (const void *, const void *, dbref, dbref,
ufun_attrib *, NEW_PE_INFO *);
void sane_qsort(void **array, int left, int right, comp_func compare,
dbref executor, dbref enactor, ufun_attrib *ufun,
dbref executor, dbref enactor, ufun_attrib * ufun,
NEW_PE_INFO *pe_info);
@@ -83,7 +83,7 @@ int str_comp(const void *s1, const void *s2);
int stri_comp(const void *s1, const void *s2);
int dbref_comp(const void *s1, const void *s2);
int attr_comp(const void *s1, const void *s2);
int u_comp(const void *s1, const void *s2, dbref executor, dbref enactor, ufun_attrib *ufun, NEW_PE_INFO *pe_info); /* For sortby() */
int u_comp(const void *s1, const void *s2, dbref executor, dbref enactor, ufun_attrib * ufun, NEW_PE_INFO *pe_info); /* For sortby() */
int compare_attr_names(const char *attr1, const char *attr2);
View
@@ -1,3 +1,3 @@
#define SVNREVISION "$Rev$"
#define SVNDATE "$Date$"
/* Built at 20120131162655 */
/* Built at 20120201145728 */
View
@@ -1,4 +1,4 @@
#define VERSION "1.8.4"
#define PATCHLEVEL "8"
#define PATCHDATE "[11/11/2011]"
#define NUMVERSION 1008004008
#define PATCHLEVEL "9"
#define PATCHDATE "[02/05/2012]"
#define NUMVERSION 1008004009
View
@@ -77,7 +77,7 @@ static w128_t sfmt[N];
static uint32_t *psfmt32 = &sfmt[0].u[0];
#if !defined(BIG_ENDIAN64) || defined(ONLY64)
/** the 64bit integer pointer to the 128-bit internal state array */
static uint64_t *psfmt64 = (uint64_t *) & sfmt[0].u[0];
static uint64_t *psfmt64 = (uint64_t *) &sfmt[0].u[0];
#endif
/** index counter to the 32-bit internal state array */
static int idx;
@@ -518,7 +518,7 @@ gen_rand64(void)
* returns the pointer to the aligned memory block.
*/
void
fill_array32(uint32_t * array, int size)
fill_array32(uint32_t *array, int size)
{
assert(initialized);
assert(idx == N32);
@@ -556,7 +556,7 @@ fill_array32(uint32_t * array, int size)
* returns the pointer to the aligned memory block.
*/
void
fill_array64(uint64_t * array, int size)
fill_array64(uint64_t *array, int size)
{
assert(initialized);
assert(idx == N32);
@@ -600,7 +600,7 @@ init_gen_rand(uint32_t seed)
* @param key_length the length of init_key.
*/
void
init_by_array(uint32_t * init_key, int key_length)
init_by_array(uint32_t *init_key, int key_length)
{
int i, j, count;
uint32_t r;
View
@@ -658,8 +658,8 @@ do_list_access(dbref player)
* This makes a copy of the options string, so it's not modified.
*/
int
parse_access_options(const char *opts, dbref *who, uint32_t * can,
uint32_t * cant, dbref player)
parse_access_options(const char *opts, dbref *who, uint32_t *can,
uint32_t *cant, dbref player)
{
char myopts[BUFFER_LEN];
char *p;
View
@@ -1698,7 +1698,9 @@ atr_comm_match(dbref thing, dbref player, int type, int end, char const *str,
tprintf("#%d/%s", thing, AL_NAME(ptr)));
} else {
/* Normal queue */
parse_que_attr(thing, player, s, pe_regs, ptr, (queue_type & QUEUE_DEBUG_PRIVS ? can_debug(player, thing) : 0));
parse_que_attr(thing, player, s, pe_regs, ptr,
(queue_type & QUEUE_DEBUG_PRIVS ?
can_debug(player, thing) : 0));
}
pe_regs_free(pe_regs);
}
@@ -1842,7 +1844,9 @@ one_comm_match(dbref thing, dbref player, const char *atr, const char *str,
tprintf("#%d/%s", thing, AL_NAME(ptr)));
} else {
/* Normal queue */
parse_que_attr(thing, player, s, pe_regs, ptr, (queue_type & QUEUE_DEBUG_PRIVS ? can_debug(player, thing) : 0));
parse_que_attr(thing, player, s, pe_regs, ptr,
(queue_type & QUEUE_DEBUG_PRIVS ?
can_debug(player, thing) : 0));
}
pe_regs_free(pe_regs);
}
View
@@ -242,7 +242,7 @@ struct bvm_asm {
static uint8_t *
safe_get_bytecode(boolexp b)
__attribute_malloc__;
static uint8_t *get_bytecode(boolexp b, uint16_t * storelen);
static uint8_t *get_bytecode(boolexp b, uint16_t *storelen);
static struct boolexp_node *alloc_bool(void) __attribute_malloc__;
static struct boolatr *alloc_atr(const char *name,
const char *s,
@@ -320,7 +320,7 @@ safe_get_bytecode(boolexp b)
* \return a static copy of the bytecode.
*/
static uint8_t *
get_bytecode(boolexp b, uint16_t * storelen)
get_bytecode(boolexp b, uint16_t *storelen)
{
static uint8_t bytecode[BUFFER_LEN * 2];
uint16_t len;
View
@@ -403,7 +403,8 @@ static void dump_users(DESC *call_by, char *match);
static const char *time_format_1(time_t dt);
static const char *time_format_2(time_t dt);
static void announce_connect(DESC *d, int isnew, int num);
static void announce_disconnect(DESC *saved, const char *reason, bool reboot, dbref executor);
static void announce_disconnect(DESC *saved, const char *reason, bool reboot,
dbref executor);
bool inactivity_check(void);
void reopen_logs(void);
void load_reboot_db(void);
@@ -3976,7 +3977,8 @@ announce_connect(DESC *d, int isnew, int num)
}
static void
announce_disconnect(DESC *saved, const char *reason, bool reboot, dbref executor)
announce_disconnect(DESC *saved, const char *reason, bool reboot,
dbref executor)
{
dbref loc;
int num;
Oops, something went wrong.

0 comments on commit 98087a6

Please sign in to comment.