Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 5042 → Rev 5043

/contrib/network/netsurf/netsurf/utils/http/make.http
18,5 → 18,5
 
 
OUTFILE = TEST.o
CFLAGS += -I ../include/ -I ../ -I../../ -I./ -I/home/sourcerer/kos_src/newenginek/kolibri/include
CFLAGS += -I ../include/ -I ../ -I../../ -I./ -I/home/sourcerer/kos_src/newenginek/kolibri/include -I ../../../libwapcaplet/include/
include $(MENUETDEV)/makefiles/Makefile_for_o_lib
/contrib/network/netsurf/netsurf/utils/libdom.h
28,8 → 28,8
 
#include <dom/dom.h>
 
#include <dom/bindings/hubbub/parser.h>
#include <dom/bindings/hubbub/errors.h>
#include <libdom/bindings/hubbub/parser.h>
#include <libdom/bindings/hubbub/errors.h>
 
/**
* depth-first walk the dom calling callback for each element
/contrib/network/netsurf/netsurf/utils/make.utils
19,5 → 19,5
 
 
OUTFILE = TEST.o
CFLAGS += -I ../include/ -I ../ -I../../ -I./ -I/home/sourcerer/kos_src/newenginek/kolibri/include
CFLAGS += -I ../include/ -I ../ -I../../ -I./ -I/home/sourcerer/kos_src/newenginek/kolibri/include -I ../../libdom/include -I ../../libwapcaplet/include -I ../../libhubbub/include -I ../../libparserutils/include/
include $(MENUETDEV)/makefiles/Makefile_for_o_lib
/contrib/network/netsurf/netsurf/utils/url.c
35,7 → 35,10
#include "utils/log.h"
#include "utils/url.h"
#include "utils/utils.h"
#include "content/fetchers/http_msg.h"
#include "content/fetchers/http.h"
 
 
struct url_components_internal {
char *buffer; /* buffer used for all the following data */
char *scheme;
787,21 → 790,37
{
char *curlstr;
char *retstr;
/* curlstr = curl_unescape(str, 0); */
LOG(("Address of str is : %x\n", str));
LOG(("url is %s\n", str));
 
curlstr = curl_unescape(str, 0);
LOG(("Calling http_unescape_url in url.c\n"));
curlstr = http_unescape_url(str);
LOG(("http_unescape_url returned.\n"));
__menuet__debug_out("http_unescape_url returned\n");
 
if (curlstr == NULL) {
return URL_FUNC_NOMEM;
}
__menuet__debug_out("Calling strdup in url.c with : ");
__menuet__debug_out(curlstr);
__menuet__debug_out("\n");
 
retstr = strdup(curlstr);
curl_free(curlstr);
/* free(curlstr); */ /* Doesn't work because mem not allocated with malloc/calloc/realloc*/
/* TODO: Use mem_free here*/
 
__menuet__debug_out("After strdup in url.c\n");
 
if (retstr == NULL) {
__menuet__debug_out("retstr is NULL in url.c\n");
return URL_FUNC_NOMEM;
}
 
*result = retstr;
__menuet__debug_out("returning from url_unescape in url.c\n");
return URL_FUNC_OK;
 
}
 
/**
/contrib/network/netsurf/netsurf/utils/utils.c
276,12 → 276,12
{
struct timeval tv;
 
LOG(("WALLCLOCK IS HERE"));
/* LOG(("WALLCLOCK IS HERE")); */
if (gettimeofday(&tv, NULL) == -1)
{LOG(("And -1"));return 0;}
 
LOG(("And time"));
/* LOG(("And time")); */
return ((tv.tv_sec * 100) + (tv.tv_usec / 10000));
}