From a17a76ecbedd02a249b25cb12be67021d36cb8b3 Mon Sep 17 00:00:00 2001 From: "psyc://psyced.org/~lynX" <@> Date: Tue, 10 May 2011 14:09:32 +0200 Subject: [PATCH] less warnings for me --- src/pkg-psyc.h | 52 ++++++++++++++++++++++++++------------------------ src/version.sh | 2 +- 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/src/pkg-psyc.h b/src/pkg-psyc.h index e010d42..afd09ee 100644 --- a/src/pkg-psyc.h +++ b/src/pkg-psyc.h @@ -17,35 +17,37 @@ # include "xalloc.h" typedef struct psyc_state_s { - psycParseState *parser; - vector_t *packet; - // tmp storage for incomplete modifier/body - char oper; - char *name; - size_t name_len; - char *value; - size_t value_len; - // tmp storage for remaining unparsed bytes at the end of the buffer - char *remaining; - size_t remaining_len; + psycParseState *parser; + vector_t *packet; + // tmp storage for incomplete modifier/body + char oper; + char *name; + size_t name_len; + char *value; + size_t value_len; + // tmp storage for remaining unparsed bytes at the end of the buffer + char *remaining; + size_t remaining_len; } psyc_state_t; static inline void psyc_free_state (psyc_state_t *ps) { - if (!ps) - return; - if (ps->name) - pfree((void *) ps->name); - if (ps->value) - pfree((void *) ps->value); - if (ps->remaining) - pfree((void *) ps->remaining); - if (ps->parser) - pfree((void *) ps->parser); - if (ps->packet) - free_array(ps->packet); - ps->name = ps->value = ps->remaining = ps->parser = ps->packet = NULL; - ps->oper = ps->name_len = ps->value_len = ps->remaining_len = 0; + if (!ps) + return; + if (ps->name) + pfree((void *) ps->name); + if (ps->value) + pfree((void *) ps->value); + if (ps->remaining) + pfree((void *) ps->remaining); + if (ps->parser) + pfree((void *) ps->parser); + if (ps->packet) + free_array(ps->packet); + ps->name = ps->value = ps->remaining = NULL; + ps->parser = NULL; + ps->packet = NULL; + ps->oper = ps->name_len = ps->value_len = ps->remaining_len = 0; } # define PKG_PSYC_H diff --git a/src/version.sh b/src/version.sh index d7a9f61..51f47c9 100644 --- a/src/version.sh +++ b/src/version.sh @@ -17,7 +17,7 @@ version_longtype="stable" # A timestamp, to be used by bumpversion and other scripts. # It can be used, for example, to 'touch' this file on every build, thus # forcing revision control systems to add it on every checkin automatically. -version_stamp="Tue May 10 01:00:33 CEST 2011" +version_stamp="Tue May 10 14:07:26 CEST 2011" # Okay, LDMUD is using 3.x.x so to avoid conflicts let's just use 4.x.x version_major=4