r3306 dsilvers - in /trunk/netsurf: !NetSurf/!Run, feb content/fetch.c desktop/netsurf.c desktop/netsurf.h utils/log.h

Author: dsilvers Date: Wed May 30 23:27:58 2007 New Revision: 3306 URL: http://svn.semichrome.net?rev=3D3306&view=3Drev Log: Add a -v option to enable debug logging. Pass -v by default to the RO runim= age. Modified: trunk/netsurf/!NetSurf/!Run,feb trunk/netsurf/content/fetch.c trunk/netsurf/desktop/netsurf.c trunk/netsurf/desktop/netsurf.h trunk/netsurf/utils/log.h Modified: trunk/netsurf/!NetSurf/!Run,feb URL: http://svn.semichrome.net/trunk/netsurf/%21NetSurf/%21Run%2Cfeb?rev=3D= 3306&r1=3D3305&r2=3D3306&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/netsurf/!NetSurf/!Run,feb (original) +++ trunk/netsurf/!NetSurf/!Run,feb Wed May 30 23:27:58 2007 @@ -100,7 +100,7 @@ FontInstall NetSurf:Resources.Fonts. = WimpSlot -min 2240k -max 2240k -Run <NetSurf$Dir>.!RunImage %*0 2><Wimp$ScrapDir>.WWW.NetSurf.Log +Run <NetSurf$Dir>.!RunImage -v %*0 2><Wimp$ScrapDir>.WWW.NetSurf.Log = | Uninstall NetSurf-specific fonts -FontRemove NetSurf:Resources.Fonts. +FontRemove NetSurf:Resources.Fonts. Modified: trunk/netsurf/content/fetch.c URL: http://svn.semichrome.net/trunk/netsurf/content/fetch.c?rev=3D3306&r1= =3D3305&r2=3D3306&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/netsurf/content/fetch.c (original) +++ trunk/netsurf/content/fetch.c Wed May 30 23:27:58 2007 @@ -248,7 +248,11 @@ if (code !=3D CURLE_OK) \ goto curl_easy_setopt_failed; = - SETOPT(CURLOPT_VERBOSE, 1); + if (verbose_log) { + SETOPT(CURLOPT_VERBOSE, 1); + } else { + SETOPT(CURLOPT_VERBOSE, 0); + } SETOPT(CURLOPT_ERRORBUFFER, fetch_error_buffer); SETOPT(CURLOPT_WRITEFUNCTION, fetch_curl_data); SETOPT(CURLOPT_HEADERFUNCTION, fetch_curl_header); Modified: trunk/netsurf/desktop/netsurf.c URL: http://svn.semichrome.net/trunk/netsurf/desktop/netsurf.c?rev=3D3306&r= 1=3D3305&r2=3D3306&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/netsurf/desktop/netsurf.c (original) +++ trunk/netsurf/desktop/netsurf.c Wed May 30 23:27:58 2007 @@ -31,6 +31,7 @@ #include "netsurf/utils/utils.h" = bool netsurf_quit =3D false; +bool verbose_log =3D false; = static void netsurf_init(int argc, char** argv); static void netsurf_poll(void); @@ -65,6 +66,15 @@ struct utsname utsname; = stdout =3D stderr; + + if ((argc > 1) && (argv[1][0] =3D=3D '-') && (argv[1][1] =3D=3D 'v') && (= argv[1][2] =3D=3D 0)) { + int argcmv; + verbose_log =3D true; + for (argcmv =3D 2; argcmv < argc; argcmv++) { + argv[argcmv - 1] =3D argv[argcmv]; + } + argc--; + } = #ifdef _MEMDEBUG_H_ memdebug_memdebug("memdump"); Modified: trunk/netsurf/desktop/netsurf.h URL: http://svn.semichrome.net/trunk/netsurf/desktop/netsurf.h?rev=3D3306&r= 1=3D3305&r2=3D3306&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/netsurf/desktop/netsurf.h (original) +++ trunk/netsurf/desktop/netsurf.h Wed May 30 23:27:58 2007 @@ -11,6 +11,7 @@ #include <stdbool.h> = extern bool netsurf_quit; +extern bool verbose_log; extern const char * const netsurf_version; extern const int netsurf_version_major; extern const int netsurf_version_minor; Modified: trunk/netsurf/utils/log.h URL: http://svn.semichrome.net/trunk/netsurf/utils/log.h?rev=3D3306&r1=3D33= 05&r2=3D3306&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/netsurf/utils/log.h (original) +++ trunk/netsurf/utils/log.h Wed May 30 23:27:58 2007 @@ -7,6 +7,7 @@ */ = #include <stdio.h> +#include "netsurf/desktop/netsurf.h" = #ifndef _NETSURF_LOG_H_ #define _NETSURF_LOG_H_ @@ -15,11 +16,11 @@ # define LOG(x) ((void) 0) #else # ifdef __GNUC__ -# define LOG(x) (printf(__FILE__ " %s %i: ", __PRETTY_FUNCTION__, __LIN= E__), printf x, fputc('\n', stdout)) +# define LOG(x) do { if (verbose_log) (printf(__FILE__ " %s %i: ", __PR= ETTY_FUNCTION__, __LINE__), printf x, fputc('\n', stdout)); } while (0) # elif defined(__CC_NORCROFT) -# define LOG(x) (printf(__FILE__ " %s %i: ", __func__, __LINE__), print= f x, fputc('\n', stdout)) +# define LOG(x) do { if (verbose_log) (printf(__FILE__ " %s %i: ", __fu= nc__, __LINE__), printf x, fputc('\n', stdout)); } while (0) # else -# define LOG(x) (printf(__FILE__ " %i: ", __LINE__), printf x, fputc('\= n', stdout)) +# define LOG(x) do { if (verbose_log) (printf(__FILE__ " %i: ", __LINE_= _), printf x, fputc('\n', stdout)); } while (0) # endif #endif =