[svn:mod_parrot] r199 - mod_parrot/trunk

Author: jhorwitz
Date: Tue Aug  9 10:58:07 2005
New Revision: 199

Modified:
   mod_parrot/trunk/mod_parrot.c
   mod_parrot/trunk/mod_parrot.h
   mod_parrot/trunk/modparrot_config.c
   mod_parrot/trunk/parrot_util.c
Log:
fix compiler warnings on SuSE 9.3 gcc version 3.3.5 (from [email protected])


Modified: mod_parrot/trunk/mod_parrot.c
==============================================================================
--- mod_parrot/trunk/mod_parrot.c	(original)
+++ mod_parrot/trunk/mod_parrot.c	Tue Aug  9 10:58:07 2005
@@ -17,6 +17,8 @@
 
 #include <string.h>
 
+#include "apr_strings.h"
+
 #include "httpd.h"
 #include "http_log.h"
 #include "http_protocol.h"
@@ -122,7 +124,6 @@ static modparrot_context *init_ctx(serve
 int modparrot_hll_handler(Parrot_Interp interp, char *hll, char *hll_handler,
     char *handler, int *ret)
 {
-    Parrot_PMC sub;
     char hll_namespace[255];
 
     if (!hll) hll = DEFAULT_HLL_HANDLER;
@@ -224,6 +225,7 @@ static int modparrot_pre_connection_hand
     }
 
     /* tell apache we're done */
+    return handler_status;
 }
 
 static int modparrot_map_to_storage_handler(request_rec *r)

Modified: mod_parrot/trunk/mod_parrot.h
==============================================================================
--- mod_parrot/trunk/mod_parrot.h	(original)
+++ mod_parrot/trunk/mod_parrot.h	Tue Aug  9 10:58:07 2005
@@ -55,6 +55,7 @@ void modparrot_destroy_interpreter(Parro
 int modparrot_call_sub(Parrot_Interp, char *, char *);
 int modparrot_call_sub_Iv(Parrot_Interp, char *, char *, int *);
 int modparrot_call_sub_IS(Parrot_Interp, char *, char *, int *, char *);
+char *modparrot_backtrace(Parrot_Interp);
 int modparrot_hll_handler(Parrot_Interp, char *, char *, char *, int *);
 Parrot_PMC get_sub_pmc(Parrot_Interp , char *, char *);
 int mp_ctx_pool_init(apr_pool_t *, int);

Modified: mod_parrot/trunk/modparrot_config.c
==============================================================================
--- mod_parrot/trunk/modparrot_config.c	(original)
+++ mod_parrot/trunk/modparrot_config.c	Tue Aug  9 10:58:07 2005
@@ -134,7 +134,7 @@ static modparrot_handler_info *parse_han
     }
 
     /* split handler into HLL and ID */
-    if (part = strchr(handler, ',')) {
+    if ((part = strchr((char *)handler, ','))) {
         l->hll = apr_pstrndup(p, handler, part-handler);
         l->id = apr_pstrdup(p, part+1);
     }

Modified: mod_parrot/trunk/parrot_util.c
==============================================================================
--- mod_parrot/trunk/parrot_util.c	(original)
+++ mod_parrot/trunk/parrot_util.c	Tue Aug  9 10:58:07 2005
@@ -57,6 +57,7 @@ int modparrot_load_bytecode(Parrot_Inter
 {
     /* XXX what does this do on error? */
     Parrot_load_bytecode(interp, path);
+    return(1);
 }
 
 void modparrot_destroy_interpreter(Parrot_Interp interp)
@@ -73,6 +74,7 @@ int modparrot_call_sub(Parrot_Interp int
         return(0);
     }
     Parrot_call_sub(interp, sub, "v");
+    return(1);
 }
 
 int modparrot_call_sub_Iv(Parrot_Interp interp, char *namespace, char *name,
@@ -211,5 +213,7 @@ char *modparrot_backtrace(Parrot_Interp 
         string_nprintf(interp, buf, 0, "... call repeated %d times\n",
             rec_level);
     }
+    trace_string = string_to_cstring(interp, buf);
+    return(trace_string);
 }
 #endif /* PARROT_NEW_CALL_CONV */