rev 474 - in trunk: modules/Prosist src

Author: bcollins
Date: 2004-05-12 18:16:41 -0400 (Wed, 12 May 2004)
New Revision: 474

Modified:
   trunk/modules/Prosist/Prosist.c
   trunk/src/builtins-core.c
   trunk/src/parser_routines.c
Log:
Fixup warnings.


Modified: trunk/modules/Prosist/Prosist.c
===================================================================
--- trunk/modules/Prosist/Prosist.c	2004-05-12 22:15:25 UTC (rev 473)
+++ trunk/modules/Prosist/Prosist.c	2004-05-12 22:16:41 UTC (rev 474)
@@ -401,7 +401,7 @@
 	reuse_proxy = obj_known && rback_flg && is_archived(obj);
 	repair_obj  = obj_known && rback_flg && !is_archived(obj);
 
-	if (obj == PSNONE || !append_all && obj_known) {
+	if (obj == PSNONE || (!append_all && obj_known)) {
 		list_item_set(ist, store_refs, objidx, PSNONE);
 		del_unlock(mw_obj);
 		return;

Modified: trunk/src/builtins-core.c
===================================================================
--- trunk/src/builtins-core.c	2004-05-12 22:15:25 UTC (rev 473)
+++ trunk/src/builtins-core.c	2004-05-12 22:16:41 UTC (rev 474)
@@ -718,7 +718,7 @@
 	} else 
 		self->data.ptr = other->data.ptr;
 	read_unlock(ist, self);
-	if (fparms = get_attr(ist,  other, SYM(FPARAMS_)))
+	if ((fparms = get_attr(ist,  other, SYM(FPARAMS_))))
 		 set_attr(ist, self, SYM(FPARAMS_), copy_list_obj(ist, fparms));
 	read_lock(ist, self);
 	return OBJ(NONE);
@@ -729,10 +729,10 @@
 	char str[128];
 
 	BIN_STR_CHK(Func);
-	apr_snprintf(str, sizeof(str), "<func:%x", (unsigned long)(intptr_t) self);
+	apr_snprintf(str, sizeof(str), "<func:%"APR_UINT64_T_HEX_FMT, (apr_uint64_t)(intptr_t) self);
 	if (self->data_type == DATA_TYPE_FUNCPTR)
 		strcat(str, ":c");
-	if (bobj = get_attr(ist, self, SYM(BINDOBJ_))) {
+	if ((bobj = get_attr(ist, self, SYM(BINDOBJ_)))) {
 		strcat(str, ":bound:");
 		strcat(str, as_str(ist, bobj));
 	}

Modified: trunk/src/parser_routines.c
===================================================================
--- trunk/src/parser_routines.c	2004-05-12 22:15:25 UTC (rev 473)
+++ trunk/src/parser_routines.c	2004-05-12 22:16:41 UTC (rev 474)
@@ -108,8 +108,8 @@
 		char *d, *s;
 		filename = pr_malloc(39);
 		for (s=string, d=filename; *s && d < filename+30; s++) 
-			if (*s >= 'a' && *s <= 'z' || *s >= 'A' && *s <= 'Z'|| 
-				*s >= '0' && *s <= '9' || *s == '_')
+			if ((*s >= 'a' && *s <= 'z') || (*s >= 'A' && *s <= 'Z') || 
+				(*s >= '0' && *s <= '9') || *s == '_')
 				*d++ = *s;
 		*d = 0;
 		strcat(filename, "-src.txt");
@@ -118,8 +118,8 @@
 #ifdef TRACE_PARSER
 	{	char *d, *s, *dfname = pr_malloc(35);
 		for (s=filename, d=dfname; *s && d < dfname+30; s++) 
-			if (*s >= 'a' && *s <= 'z' || *s >= 'A' && *s <= 'Z'|| 
-				*s >= '0' && *s <= '9' || *s == '_')
+			if ((*s >= 'a' && *s <= 'z') || (*s >= 'A' && *s <= 'Z') || 
+				(*s >= '0' && *s <= '9') || *s == '_')
 				*d++ = *s;
 		*d = 0;
 		strcat(dfname, ".txt");