Changeset 156

Timestamp:

09/04/07 14:40:58 (20 months ago)

Author:

smoku

Message:

Integrated compilation fixes by Stefan Huehner. Closes #51

Location:

trunk

Files:

• c2s/authreg.c (modified) (1 diff)
• c2s/authreg_mysql.c (modified) (3 diffs)
• router/aci.c (modified) (1 diff)
• router/main.c (modified) (1 diff)
• router/router.h (modified) (1 diff)
• sm/mod_iq_vcard.c (modified) (3 diffs)
• sm/pres.c (modified) (1 diff)
• sm/storage.c (modified) (2 diffs)
• sx/error.c (modified) (3 diffs)
• sx/ssl.h (modified) (1 diff)
• sx/sx.c (modified) (3 diffs)
• sx/sx.h (modified) (4 diffs)
• util/config.c (modified) (5 diffs)
• util/jid.c (modified) (1 diff)
• util/log.c (modified) (3 diffs)
• util/nad.c (modified) (5 diffs)
• util/pool.c (modified) (4 diffs)
• util/str.c (modified) (3 diffs)
• util/util.h (modified) (5 diffs)
• util/xdata.c (modified) (1 diff)
• util/xhash.c (modified) (3 diffs)

trunk/c2s/authreg.c

@@ -54 +54 @@
 #endif
 
-char *module_names[] = {
+static const char *module_names[] = {
 #ifdef STORAGE_MYSQL
     "mysql",

trunk/c2s/authreg_mysql.c

@@ -320 +320 @@
 
 /** Provide a configuration parameter or default value. */
-char * _ar_mysql_param( config_t c, char * key, char * def ) {
+static char * _ar_mysql_param( config_t c, char * key, char * def ) {
     char * value = config_get_one( c, key, 0 );
     if( value == NULL )
@@ -333 +333 @@
 /* expected to follow the escape characters '%' in the template. */
 /* Returns 0 on success, or an error message on failures. */
-char * _ar_mysql_check_template( char * template, char * types ) {
+static char * _ar_mysql_check_template( char * template, char * types ) {
     int pScan = 0;
     int pType = 0;
@@ -369 +369 @@
 /* written to the error log. */
 /* Returns 0 on success, or 1 on errors. */
-int _ar_mysql_check_sql( authreg_t ar, char * sql, char * types ) {
+static int _ar_mysql_check_sql( authreg_t ar, char * sql, char * types ) {
   char * error;
 

trunk/router/aci.c

@@ -92 +92 @@
 
 /** see if a username is in an acl */
-int aci_check(xht aci, char *type, char *name) {
+int aci_check(xht aci, const char *type, const char *name) {
     aci_user_t list, scan;
 

trunk/router/main.c

@@ -24 +24 @@
 static sig_atomic_t router_logrotate = 0;
 
-void router_signal(int signum)
+static void router_signal(int signum)
 {
     router_shutdown = 1;
 }
 
-void router_signal_hup(int signum)
+static void router_signal_hup(int signum)
 {
     router_logrotate = 1;

trunk/router/router.h

@@ -202 +202 @@
 xht     aci_load(router_t r);
 void    aci_unload(xht aci);
-int     aci_check(xht acls, char *type, char *name);
+int     aci_check(xht acls, const char *type, const char *name);
 
 int     user_table_load(router_t r);

trunk/sm/mod_iq_vcard.c

@@ -43 +43 @@
  */
 
-static char *_iq_vcard_map[] = {
+static const char *_iq_vcard_map[] = {
     "FN",           "fn",
     "NICKNAME",     "nickname",
@@ -98 +98 @@
     os_object_t o;
     int i = 0, elem;
-    char *vkey, *dkey, *vskey, ekey[10], cdata[VCARD_MAX_FIELD_SIZE];
+    char ekey[10], cdata[VCARD_MAX_FIELD_SIZE];
+    const char *vkey, *dkey, *vskey;
 
     log_debug(ZONE, "building object from packet");
@@ -141 +142 @@
     os_object_t o;
     int i = 0, elem;
-    char *vkey, *dkey, *vskey, ekey[10], *dval;
+    char ekey[10], *dval;
+    const char *vkey, *dkey, *vskey;
     
     log_debug(ZONE, "building packet from object");

trunk/sm/pres.c

@@ -38 +38 @@
 
 /** select a new top session based on current session presence */
-void _pres_top(user_t user) {
+static void _pres_top(user_t user) {
     sess_t scan;
 

trunk/sm/storage.c

@@ -53 +53 @@
 #endif
 
-static char *st_driver_names[] = {
+static const char *st_driver_names[] = {
 #ifdef STORAGE_DB
     "db",
@@ -472 +472 @@
 }
 
-int _storage_match(st_filter_t f, os_object_t o, os_t os) {
+static int _storage_match(st_filter_t f, os_object_t o, os_t os) {
     void *val;
     os_type_t ot;

trunk/sx/error.c

@@ -22 +22 @@
 
 /** if you change these, reflect your changes in the defines in sx.h */
-static char *_stream_errors[] = {
+static const char *_stream_errors[] = {
     "bad-format",
     "bad-namespace-prefix",
@@ -51 +51 @@
 
 /** send an error */
-void _sx_error(sx_t s, int err, char *text) {
+void _sx_error(sx_t s, int err, const char *text) {
     int len = 0;
     sx_buf_t buf;
@@ -86 +86 @@
 }
 
-void sx_error(sx_t s, int err, char *text) {
+void sx_error(sx_t s, int err, const char *text) {
     assert(s != NULL);
     assert(err >= 0 && err < stream_err_LAST);

trunk/sx/ssl.h

@@ -26 +26 @@
 #ifdef HAVE_SSL
 
+#include <openssl/md5.h>
 #include <openssl/ssl.h>
 #include <openssl/err.h>

trunk/sx/sx.c

@@ -200 +200 @@
    of garbage, to be overwritten by caller. otherwise, data pointed to
    by 'data' will be copied into buf */
-sx_buf_t _sx_buffer_new(char *data, int len, _sx_notify_t notify, void *notify_arg) {
+sx_buf_t _sx_buffer_new(const char *data, int len, _sx_notify_t notify, void *notify_arg) {
     sx_buf_t buf;
 
@@ -298 +298 @@
 
 /** debug macro helpers */
-void __sx_debug(char *file, int line, const char *msgfmt, ...) {
+void __sx_debug(const char *file, int line, const char *msgfmt, ...) {
     va_list ap;
     char *pos, message[MAX_DEBUG];
@@ -316 +316 @@
 }
 
-int __sx_event(char *file, int line, sx_t s, sx_event_t e, void *data) {
+int __sx_event(const char *file, int line, sx_t s, sx_event_t e, void *data) {
     int ret;
 

trunk/sx/sx.h

@@ -167 +167 @@
 
 /* send errors and close stuff */
-void                        sx_error(sx_t s, int err, char *text);
+void                        sx_error(sx_t s, int err, const char *text);
 void                        sx_close(sx_t s);
 void                        sx_kill(sx_t s);
@@ -198 +198 @@
 
 /* buffer utilities */
-sx_buf_t                     _sx_buffer_new(char *data, int len, _sx_notify_t notify, void *notify_arg);
+sx_buf_t                     _sx_buffer_new(const char *data, int len, _sx_notify_t notify, void *notify_arg);
 void                        _sx_buffer_free(sx_buf_t buf);
 void                        _sx_buffer_clear(sx_buf_t buf);
@@ -214 +214 @@
 
 /* send errors and close stuff */
-void                        _sx_error(sx_t s, int err, char *text);
+void                        _sx_error(sx_t s, int err, const char *text);
 void                        _sx_close(sx_t s);
 
@@ -348 +348 @@
 
 /** helper functions for macros when we're debugging */
-void        __sx_debug(char *file, int line, const char *msgfmt, ...);
+void        __sx_debug(const char *file, int line, const char *msgfmt, ...);
 
 /** helper and internal macro for firing the callback */
-int         __sx_event(char *file, int line, sx_t s, sx_event_t e, void *data);
+int         __sx_event(const char *file, int line, sx_t s, sx_event_t e, void *data);
 #define _sx_event(s,e,data) __sx_event(ZONE, s, e, data)
 

trunk/util/config.c

@@ -73 +73 @@
 
 /** turn an xml file into a config hash */
-int config_load(config_t c, char *file)
+int config_load(config_t c, const char *file)
 {
     struct build_data bd;
@@ -233 +233 @@
 
 /** get the config element for this key */
-config_elem_t config_get(config_t c, char *key)
+config_elem_t config_get(config_t c, const char *key)
 {
     return xhash_get(c->hash, key);
@@ -239 +239 @@
 
 /** get config value n for this key */
-char *config_get_one(config_t c, char *key, int num)
+char *config_get_one(config_t c, const char *key, int num)
 {
     config_elem_t elem = xhash_get(c->hash, key);
@@ -253 +253 @@
 
 /** how many values for this key? */
-int config_count(config_t c, char *key)
+int config_count(config_t c, const char *key)
 {
     config_elem_t elem = xhash_get(c->hash, key);
@@ -264 +264 @@
 
 /** get an attr for this value */
-char *config_get_attr(config_t c, char *key, int num, char *attr)
+char *config_get_attr(config_t c, const char *key, int num, const char *attr)
 {
     config_elem_t elem = xhash_get(c->hash, key);

trunk/util/jid.c

@@ -80 +80 @@
 
 /** do stringprep on the pieces */
-int jid_prep_pieces(prep_cache_t pc, char *node, char *domain, char *resource) {
+static int jid_prep_pieces(prep_cache_t pc, char *node, char *domain, char *resource) {
 #ifdef HAVE_IDN
     char str[1024], *prep;

trunk/util/log.c

@@ -51 +51 @@
 };
 
-static int _log_facility(char *facility) {
+static int _log_facility(const char *facility) {
     log_facility_t *lp;
 
@@ -65 +65 @@
 }
 
-log_t log_new(log_type_t type, char *ident, char *facility)
+log_t log_new(log_type_t type, const char *ident, const char *facility)
 {
     log_t log;
@@ -171 +171 @@
 #ifdef DEBUG
 /** debug logging */
-void debug_log(char *file, int line, const char *msgfmt, ...)
+void debug_log(const char *file, int line, const char *msgfmt, ...)
 {
     va_list ap;

trunk/util/nad.c

@@ -66 +66 @@
 
 /** internal: do and return the math and ensure it gets realloc'd */
-int _nad_realloc(void **oblocks, int len)
+static int _nad_realloc(void **oblocks, int len)
 {
     void *nblocks;
@@ -84 +84 @@
 
 /** internal: append some cdata and return the index to it */
-int _nad_cdata(nad_t nad, const char *cdata, int len)
+static int _nad_cdata(nad_t nad, const char *cdata, int len)
 {
     NAD_SAFE(nad->cdata, nad->ccur + len, nad->clen);
@@ -94 +94 @@
 
 /** internal: create a new attr on any given elem */
-int _nad_attr(nad_t nad, int elem, int ns, const char *name, const char *val, int vallen)
+static int _nad_attr(nad_t nad, int elem, int ns, const char *name, const char *val, int vallen)
 {
     int attr;
@@ -842 +842 @@
 }
 
-void _nad_escape(nad_t nad, int data, int len, int flag)
+static void _nad_escape(nad_t nad, int data, int len, int flag)
 {
     char *c;
@@ -930 +930 @@
 
 /** internal recursive printing function */
-int _nad_lp0(nad_t nad, int elem)
+static int _nad_lp0(nad_t nad, int elem)
 {
     int attr;

trunk/util/pool.c

@@ -70 +70 @@
 
 /** free a heap */
-void _pool_heap_free(void *arg)
+static void _pool_heap_free(void *arg)
 {
     struct pheap *h = (struct pheap *)arg;
@@ -79 +79 @@
 
 /** mem should always be freed last */
-void _pool_cleanup_append(pool p, struct pfree *pf)
+static void _pool_cleanup_append(pool p, struct pfree *pf)
 {
     struct pfree *cur;
@@ -97 +97 @@
 
 /** create a cleanup tracker */
-struct pfree *_pool_free(pool p, pool_cleaner f, void *arg)
+static struct pfree *_pool_free(pool p, pool_cleaner f, void *arg)
 {
     struct pfree *ret;
@@ -111 +111 @@
 
 /** create a heap and make sure it get's cleaned up */
-struct pheap *_pool_heap(pool p, int size)
+static struct pheap *_pool_heap(pool p, int size)
 {
     struct pheap *ret;

trunk/util/str.c

@@ -92 +92 @@
 }
 
-char *j_attr(const char** atts, char *attr)
+char *j_attr(const char** atts, const char *attr)
 {
     int i = 0;
@@ -128 +128 @@
 }
 
-void _spool_add(spool s, char *goodstr)
+static void _spool_add(spool s, char *goodstr)
 {
     struct spool_node *sn;
@@ -354 +354 @@
 }
 
-char *zonestr(char *file, int line)
+static char *zonestr(char *file, int line)
 {
     static char buff[64];

trunk/util/util.h

@@ -162 +162 @@
 int j_strlen(const char *a); /* provides NULL safe strlen wrapper */
 int j_atoi(const char *a, int def); /* checks for NULL and uses default instead, convienence */
-char *j_attr(const char** atts, char *attr); /* decode attr's (from expat) */
+char *j_attr(const char** atts, const char *attr); /* decode attr's (from expat) */
 char *j_strnchr(const char *s, int c, int n); /* like strchr, but only searches n chars */
 
@@ -399 +399 @@
 typedef struct log_facility_st
 {
-    char        *facility;
+    const char  *facility;
     int         number;
 } log_facility_t;
 
-extern log_t    log_new(log_type_t type, char *ident, char *facility);
+extern log_t    log_new(log_type_t type, const char *ident, const char *facility);
 extern void     log_write(log_t log, int level, const char *msgfmt, ...);
 extern void     log_free(log_t log);
@@ -572 +572 @@
 
 extern config_t         config_new(void);
-extern int              config_load(config_t c, char *file);
-extern config_elem_t    config_get(config_t c, char *key);
-extern char             *config_get_one(config_t c, char *key, int num);
-extern int              config_count(config_t c, char *key);
-extern char             *config_get_attr(config_t c, char *key, int num, char *attr);
+extern int              config_load(config_t c, const char *file);
+extern config_elem_t    config_get(config_t c, const char *key);
+extern char             *config_get_one(config_t c, const char *key, int num);
+extern int              config_count(config_t c, const char *key);
+extern char             *config_get_attr(config_t c, const char *key, int num, const char *attr);
 extern void             config_free(config_t);
 
@@ -731 +731 @@
 
 typedef struct _stanza_error_st {
-    char        *name;
-    char        *type;
-    char        *code;
+    const char  *name;
+    const char  *type;
+    const char  *code;
 } *stanza_error_t;
 
@@ -776 +776 @@
 int get_debug_flag(void);
 void set_debug_flag(int v);
-void debug_log(char *file, int line, const char *msgfmt, ...);
+void debug_log(const char *file, int line, const char *msgfmt, ...);
 #define ZONE __FILE__,__LINE__
 #define MAX_DEBUG 8192

trunk/util/xdata.c

@@ -134 +134 @@
 
 /** option insertion */
-void xdata_option_new(xdata_field_t xdf, char *value, int lvalue, char *label, int llabel) {
+static void xdata_option_new(xdata_field_t xdf, char *value, int lvalue, char *label, int llabel) {
     xdata_option_t xdo;
 

trunk/util/xhash.c

@@ -26 +26 @@
  * Andrew Binstock, "Hashing Rehashed," Dr. Dobb's Journal, April 1996.
  */
-int _xhasher(const char *s, int len)
+static int _xhasher(const char *s, int len)
 {
     /* ELF hash uses unsigned chars and unsigned arithmetic for portability */
@@ -46 +46 @@
 
 
-xhn _xhash_node_new(xht h, int index)
+static xhn _xhash_node_new(xht h, int index)
 {
     xhn n;
@@ -67 +67 @@
 
 
-xhn _xhash_node_get(xht h, const char *key, int len, int index)
+static xhn _xhash_node_get(xht h, const char *key, int len, int index)
 {
     xhn n;