Changeset 364 for trunk/zoo-project/zoo-kernel/ulinet.c

Timestamp:

Sep 29, 2012, 3:59:06 PM (12 years ago)

Author:

djay

Message:

Update to make ZOO-Kernel able to compile and run from Windows Platforms. A special thanks to Espen Messel, Knut Landmark and Benrd Härtwig for providing many patches that I can successfully apply on the SVN source tree and to Farkas for continuing requesting for ZOO-Kernel to run on Windows platforms privately and through the ZOO-Discuss mailing list.

File:

• trunk/zoo-project/zoo-kernel/ulinet.c (modified) (8 diffs)

trunk/zoo-project/zoo-kernel/ulinet.c

@@ -375 +375 @@
 
 #ifdef USE_JS
+#define XP_WIN 1
 #include "jsapi.h"
 
 char* JSValToChar(JSContext* context, jsval* arg) {
+  char *c;
+  char *tmp;
+  JSString *jsmsg;
+  size_t len;
+  int i;
   if(!JSVAL_IS_STRING(*arg)) {
     return NULL;
   }
-  char *c, *tmp;
-  JSString *jsmsg;
-  size_t len;
   jsmsg = JS_ValueToString(context,*arg);
   len = JS_GetStringLength(jsmsg);
@@ -389 +392 @@
   c = (char*)malloc((len+1)*sizeof(char));
   c[len] = '\0';
-  int i;
 #ifdef ULINET_DEBUG
   fprintf(stderr,"%d \n",len);
@@ -405 +407 @@
 HINTERNET setHeader(HINTERNET handle,JSContext *cx,JSObject *header){
   jsuint length=0;
+  jsint i=0;
+  char *tmp1;
 #ifdef ULINET_DEBUG
   fprintf(stderr,"setHeader\n");
@@ -416 +420 @@
     fprintf(stderr,"header is an array of %d elements\n",length);
 #endif
-    jsint i=0;
     handle.header=NULL;
     for(i=0;i<length;i++){
       jsval tmp;
       JS_GetElement(cx,header,i,&tmp);
-      char *tmp1=JSValToChar(cx,&tmp);
+      tmp1=JSValToChar(cx,&tmp);
 #ifdef ULINET_DEBUG
       fprintf(stderr,"Element of array n° %d, value : %s\n",i,tmp1);
@@ -440 +443 @@
   jsval *argv = JS_ARGV(cx,argv1);
   HINTERNET hInternet;
+  HINTERNET res;
+  HINTERNET res1;
+  JSObject *header;
   char *url;
   char *method;
+  char* tmpValue;
+  size_t dwRead;
+  int i=0;
   JS_MaybeGC(cx);
   hInternet=InternetOpen((LPCTSTR)"ZooWPSClient\0",
@@ -448 +457 @@
   if(!CHECK_INET_HANDLE(hInternet))
     return JS_FALSE;
-  int i=0;
   if(argc>=2){
     method=JSValToChar(cx,&argv[0]);
@@ -457 +465 @@
     url=JSValToChar(cx,argv);
   }
-  HINTERNET res;
   if(argc==4){
     char *body;
     body=JSValToChar(cx,&argv[2]);
-    JSObject *header=JSVAL_TO_OBJECT(argv[3]);
-    HINTERNET res1;
+    header=JSVAL_TO_OBJECT(argv[3]);
 #ifdef ULINET_DEBUG
     fprintf(stderr,"URL (%s) \nBODY (%s)\n",url,body);
@@ -484 +490 @@
                         INTERNET_FLAG_NO_CACHE_WRITE,0);
   }
-  char* tmpValue=(char*)malloc((res.nDataLen+1)*sizeof(char));
-  size_t dwRead;
+  tmpValue=(char*)malloc((res.nDataLen+1)*sizeof(char));
   InternetReadFile(res,(LPVOID)tmpValue,res.nDataLen,&dwRead);
   fprintf(stderr,"content downloaded (%d) (%s) \n",dwRead,tmpValue);