rev 692 - in trunk: include/prothon modules/DBM src

Author: bcollins
Date: 2004-07-01 22:25:48 -0400 (Thu, 01 Jul 2004)
New Revision: 692

Modified:
   trunk/include/prothon/prothon.h
   trunk/modules/DBM/DBM.c
   trunk/src/builtins-bytes.c
   trunk/src/builtins-core.c
   trunk/src/builtins-file.c
   trunk/src/builtins-int.c
   trunk/src/builtins-string.c
   trunk/src/interp.c
   trunk/src/memory_mgr.c
   trunk/src/object.c
Log:
Cleanup warnings.


Modified: trunk/include/prothon/prothon.h
===================================================================
--- trunk/include/prothon/prothon.h	2004-07-02 02:22:29 UTC (rev 691)
+++ trunk/include/prothon/prothon.h	2004-07-02 02:25:48 UTC (rev 692)
@@ -140,6 +140,8 @@
 #ifdef WIN32
 #undef abs
 #define abs(x) ((x) < 0 ? -(x) : (x))
+#else
+#include <stdlib.h>
 #endif
 
 // neg key value means entry is deleted

Modified: trunk/modules/DBM/DBM.c
===================================================================
--- trunk/modules/DBM/DBM.c	2004-07-02 02:22:29 UTC (rev 691)
+++ trunk/modules/DBM/DBM.c	2004-07-02 02:25:48 UTC (rev 692)
@@ -126,7 +126,8 @@
 	aprerr = apr_pool_create(&pool, get_pr_head_pool());
 	IF_APR_ERR("out of memory in getNames()") return NULL;
 
-	aprerr = apr_dbm_get_usednames_ex(pool, type, name, &used1, &used2);
+	aprerr = apr_dbm_get_usednames_ex(pool, type, name, (const char **)&used1,
+					  (const char **)&used2);
 	IF_APR_ERR("getNames() in dbm") return NULL;
 
 	res = NEW_LIST(2);
Modified: trunk/src/builtins-bytes.c
===================================================================
--- trunk/src/builtins-bytes.c	2004-07-02 02:22:29 UTC (rev 691)
+++ trunk/src/builtins-bytes.c	2004-07-02 02:25:48 UTC (rev 692)
@@ -129,7 +129,6 @@
 }
 
 DEF(Bytes, init_, FPARM2(value, OBJ(NODEF), encoding, NEW_STRING("ASCII"))) {
-	obj_p res = NULL;
 	size_t len;
 	byt_p obj_byt;
 
Modified: trunk/src/builtins-core.c
===================================================================
--- trunk/src/builtins-core.c	2004-07-02 02:22:29 UTC (rev 691)
+++ trunk/src/builtins-core.c	2004-07-02 02:25:48 UTC (rev 692)
@@ -935,8 +935,8 @@
 	range_p rangep;
 	BIN_CONTENT_CHK(RangeGen);
 	rangep = self->data.ptr;
-	if ( rangep->step > 0 && rangep->value >= rangep->stop ||
-		 rangep->step < 0 && rangep->value <= rangep->stop ) {
+	if ( (rangep->step > 0 && rangep->value >= rangep->stop) ||
+		 (rangep->step < 0 && rangep->value <= rangep->stop) ) {
 		raise_exception(ist, OBJ(STOP_ITERATION_EXC), NULL);
 		return NULL;
 	}
@@ -1043,7 +1043,8 @@
 		str_obj = as_str(ist, wrp->ref);
 		apr_snprintf(buf, sizeof(buf), "<WeakRef:%s>", str_obj);
 	} else
-		apr_snprintf(buf, sizeof(buf), "<WeakRef:deleted:%x>", (long)(intptr_t) wrp->ref);
+		apr_snprintf(buf, sizeof(buf), "<WeakRef:deleted:%lx>",
+			     (unsigned long)(intptr_t) wrp->ref);
 	set_unclonable(self);
 	return NEW_STRING(buf);
 }

Modified: trunk/src/builtins-file.c
===================================================================
--- trunk/src/builtins-file.c	2004-07-02 02:22:29 UTC (rev 691)
+++ trunk/src/builtins-file.c	2004-07-02 02:25:48 UTC (rev 692)
@@ -96,7 +96,7 @@
     apr_status_t aprerr;
 	apr_pool_t *subpool = NULL;
 	file_p filep;
-	char* temp, *p2, *p1, *p0, *p, *fullpath;
+	char* temp, *p2, *p1, *p0, *fullpath;
 	obj_p new_obj;
 
 	if (fp) 
@@ -113,7 +113,11 @@
 	} else 
 		fullpath = temp;
 #ifdef WIN32
-	for(p=fullpath; *p; p++) *p = tolower(*p);
+	{
+		char *p;
+		for (p=fullpath; *p; p++)
+			*p = tolower(*p);
+	}
 #endif
 	set_attr(ist, file_obj, sym(ist, "path"), NEW_STRING(fullpath));
 
@@ -330,7 +334,7 @@
 	filepath = pr2c_strptr(ist, get_attr(ist, self, sym(ist, "path")));
 	tempp = temp = pr_malloc(strlen(filepath)+1);
 	strcpy(temp, filepath);
-	aprerr = apr_filepath_root(&rootpath, &temp, APR_FILEPATH_TRUENAME, filep->pool);
+	aprerr = apr_filepath_root(&rootpath, (const char **)&temp, APR_FILEPATH_TRUENAME, filep->pool);
 	IF_APR_ERR("calculating root path") return NULL;
 	if (!(*temp)) {
 		raise_exception( ist, OBJ(IO_EXC), "directory is root and has no parent");
@@ -564,7 +568,7 @@
 	if (TempDir_OBJ->data.ptr) return;
 	aprerr = apr_pool_create(&subpool, get_pr_head_pool());
 	IF_APR_ERR("getting memory for TempFile") return;
-	aprerr = apr_temp_dir_get(&temp_dir, subpool);
+	aprerr = apr_temp_dir_get((const char **)&temp_dir, subpool);
 	IF_APR_ERR("getting temp dir") return;
 	su(i);
 	create_prtempdir(ist, TempDir_OBJ, temp_dir);
Modified: trunk/src/builtins-int.c
===================================================================
--- trunk/src/builtins-int.c	2004-07-02 02:22:29 UTC (rev 691)
+++ trunk/src/builtins-int.c	2004-07-02 02:25:48 UTC (rev 692)
@@ -2126,7 +2126,7 @@
 	int oct_flag   = FALSE;
 	int hex_flag   = FALSE;
 	int heX_flag   = FALSE;
-	int i, res_len, self_len, txt_len, width, precision;
+	int i, res_len, self_len, txt_len, width = 0, precision = 0;
 	ch3_p res_ptr, self_ptr, ptr;
 	BIN_STR_CHK(Int);
 	STRING_PARAM(1, spec);

Modified: trunk/src/builtins-string.c
===================================================================
--- trunk/src/builtins-string.c	2004-07-02 02:22:29 UTC (rev 691)
+++ trunk/src/builtins-string.c	2004-07-02 02:25:48 UTC (rev 692)
@@ -410,7 +410,7 @@
 	char *spec, *wid_p = NULL, *prec_p = NULL, *p;
 	int left_align = FALSE;
 	int zero_pad   = FALSE;
-	int width, precision, i, self_len, res_len;
+	int width = 0, precision = 0, i, self_len, res_len;
 	ch3_p self_ptr, res_ptr, ptr;
 
 	BIN_STR_CHK(String);
@@ -622,14 +622,18 @@
 } while (FALSE)
 
 obj_p de_spec(isp ist, ch3_p* srcp, ch3_p endp, obj_p list, obj_p dict) {
-	u32_t ch;
+	u32_t ch = 0;
 	char buf[256], *p, *pend, *var, *spec;
 	obj_p value, ins_text;
 	int i, ins_len;
 	ch3_p insp;
 	for ( p = buf, pend = buf + sizeof(buf); 
-		  p < pend && *srcp < endp && (ch = ORD(*srcp)) != BRACE_RIGHT;
+		  p < pend && *srcp < endp;
 		  p++, (*srcp)++ ) {
+
+		if ((ch = ORD(*srcp)) == BRACE_RIGHT)
+			break;
+
 		if (ch < 0x20 || ch > 0x7f) {
 			raise_exception(ist, OBJ(VALUE_EXC), "invalid character in formatting spec");
 			return NULL;
@@ -895,8 +899,6 @@
 	size_t repl_len = 0;
 	size_t result_len = str_len;
 	ch3_p buf, dest_ptr = NULL;
-	obj_p obj=0;
-	str_p obj_str = 0;
 	ch3_p src_ptr = 0;
 	ch3_p find_ptr = 0;
 	ch3_p repl_ptr = 0;

Modified: trunk/src/interp.c
===================================================================
--- trunk/src/interp.c	2004-07-02 02:22:29 UTC (rev 691)
+++ trunk/src/interp.c	2004-07-02 02:25:48 UTC (rev 692)
@@ -2185,7 +2185,7 @@
 		lbl_val_arr[i+1] = list_item(ist, uthread->params, i/2);
 	}
 	thread_module = NEW_OBJ(NULL);
-	while (new_frame = get_frame_params( ist, &idx, &fps, &new_locals, func_obj, parm_cnt, lbl_val_arr)) {
+	while ((new_frame = get_frame_params( ist, &idx, &fps, &new_locals, func_obj, parm_cnt, lbl_val_arr))) {
 		new_frame->called_from_c = TRUE;
 		new_frame->prev_frame = NULL;
 		ist->frame = new_frame;

Modified: trunk/src/memory_mgr.c
===================================================================
--- trunk/src/memory_mgr.c	2004-07-02 02:22:29 UTC (rev 691)
+++ trunk/src/memory_mgr.c	2004-07-02 02:25:48 UTC (rev 692)
@@ -338,7 +338,7 @@
 	}
 	if (mem_mgr_req_termination) {
 		obj_p obj;
-		int obj_count = 0, obj_del_count = 0;
+		int obj_count = 0;
 #ifdef DEBUG_MEM_MGR
 		time = clock();
 		printf("Memory manager phase: Calling final_ on all remaining objects\n");

Modified: trunk/src/object.c
===================================================================
--- trunk/src/object.c	2004-07-02 02:22:29 UTC (rev 691)
+++ trunk/src/object.c	2004-07-02 02:25:48 UTC (rev 692)
@@ -1179,7 +1179,7 @@
 	if(obj->data_type == DATA_TYPE_IMMDATA){
 		fprintf(fout, "%08x %08x \"%s\"\n", 
 							obj->data.i32[0], obj->data.i32[1], 
-							obj->data.str );
+							(char *)obj->data.str );
 	} else if(obj->data_type != DATA_TYPE_NONE){
 		fprintf(fout,"%08x\n", obj->data.i32[0]);
 	}