Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/1843934b37c6731fbb60665cd78bcd3f2c82d80d
...commit
http://git.netsurf-browser.org/netsurf.git/commit/1843934b37c6731fbb60665cd78bcd3f2c82d80d
...tree
http://git.netsurf-browser.org/netsurf.git/tree/1843934b37c6731fbb60665cd78bcd3f2c82d80d
The branch, ashmew2/nskolibrios has been updated
via 1843934b37c6731fbb60665cd78bcd3f2c82d80d (commit)
from 891004a4f26755acc7eb713306f7d336759549d2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=1843934b37c6731fbb60665cd78bcd3f2c82d80d
commit 1843934b37c6731fbb60665cd78bcd3f2c82d80d
Author: Ashish Gupta <[email protected]>
Commit: Ashish Gupta <[email protected]>
Revert file.c to master
diff --git a/content/fetchers/file.c b/content/fetchers/file.c
index f200eee..4fa1a21 100644
--- a/content/fetchers/file.c
+++ b/content/fetchers/file.c
@@ -42,7 +42,6 @@
#ifdef HAVE_MMAP
#include <sys/mman.h>
#endif
-
#include <libwapcaplet/libwapcaplet.h>
#include "netsurf/inttypes.h"
@@ -192,11 +191,6 @@ static void fetch_file_free(void *ctx)
/** callback to start a file fetch */
static bool fetch_file_start(void *ctx)
{
-#ifdef _TARGET_IS_KOLIBRIOS
- struct fetch_file_context *c = ctx;
- debug_board_printf("[%u] Starting file fetch : %s\n", sys_uptime(),
nsurl_access(c->url));
-#endif
-
return true;
}
@@ -256,9 +250,6 @@ static void fetch_file_process_error(struct
fetch_file_context *ctx, int code)
if (fetch_file_send_callback(&msg, ctx))
goto fetch_file_process_error_aborted;
-#ifdef _TARGET_IS_KOLIBRIOS
- debug_board_printf("[%u] Finished file fetch : %s\n", sys_uptime(),
nsurl_access(ctx->url));
-#endif
msg.type = FETCH_FINISHED;
fetch_file_send_callback(&msg, ctx);
@@ -341,9 +332,6 @@ static void fetch_file_process_plain(struct
fetch_file_context *ctx,
fetch_file_send_callback(&msg, ctx);
if (ctx->aborted == false) {
-#ifdef _TARGET_IS_KOLIBRIOS
- debug_board_printf("[%u] Finished file fetch : %s\n", sys_uptime(),
nsurl_access(ctx->url));
-#endif
msg.type = FETCH_FINISHED;
fetch_file_send_callback(&msg, ctx);
}
@@ -447,9 +435,6 @@ fetch_file_process_aborted:
}
if (ctx->aborted == false) {
-#ifdef _TARGET_IS_KOLIBRIOS
- debug_board_printf("[%u] Finished file fetch : %s\n", sys_uptime(),
nsurl_access(ctx->url));
-#endif
msg.type = FETCH_FINISHED;
fetch_file_send_callback(&msg, ctx);
}
@@ -671,13 +656,7 @@ static void fetch_file_process_dir(struct
fetch_file_context *ctx,
int i; /* directory entry index */
int n; /* number of directory entries */
-#ifndef _TARGET_IS_KOLIBRIOS
n = scandir(ctx->path, &listing, 0, dir_sort_alpha);
-#else
- /* Don't have scandir yet */
- n = 1;
-#endif
-
if (n < 0) {
fetch_file_process_error(ctx,
fetch_file_errno_to_http_code(errno));
@@ -756,10 +735,6 @@ static void fetch_file_process_dir(struct
fetch_file_context *ctx,
if (fetch_file_send_callback(&msg, ctx))
goto fetch_file_process_dir_aborted;
-#ifdef _TARGET_IS_KOLIBRIOS
- debug_board_printf("[%u] Finished file fetch : %s\n", sys_uptime(),
nsurl_access(ctx->url));
-#endif
-
msg.type = FETCH_FINISHED;
fetch_file_send_callback(&msg, ctx);
-----------------------------------------------------------------------
Summary of changes:
content/fetchers/file.c | 25 -------------------------
1 file changed, 25 deletions(-)
diff --git a/content/fetchers/file.c b/content/fetchers/file.c
index f200eee..4fa1a21 100644
--- a/content/fetchers/file.c
+++ b/content/fetchers/file.c
@@ -42,7 +42,6 @@
#ifdef HAVE_MMAP
#include <sys/mman.h>
#endif
-
#include <libwapcaplet/libwapcaplet.h>
#include "netsurf/inttypes.h"
@@ -192,11 +191,6 @@ static void fetch_file_free(void *ctx)
/** callback to start a file fetch */
static bool fetch_file_start(void *ctx)
{
-#ifdef _TARGET_IS_KOLIBRIOS
- struct fetch_file_context *c = ctx;
- debug_board_printf("[%u] Starting file fetch : %s\n", sys_uptime(),
nsurl_access(c->url));
-#endif
-
return true;
}
@@ -256,9 +250,6 @@ static void fetch_file_process_error(struct
fetch_file_context *ctx, int code)
if (fetch_file_send_callback(&msg, ctx))
goto fetch_file_process_error_aborted;
-#ifdef _TARGET_IS_KOLIBRIOS
- debug_board_printf("[%u] Finished file fetch : %s\n", sys_uptime(),
nsurl_access(ctx->url));
-#endif
msg.type = FETCH_FINISHED;
fetch_file_send_callback(&msg, ctx);
@@ -341,9 +332,6 @@ static void fetch_file_process_plain(struct
fetch_file_context *ctx,
fetch_file_send_callback(&msg, ctx);
if (ctx->aborted == false) {
-#ifdef _TARGET_IS_KOLIBRIOS
- debug_board_printf("[%u] Finished file fetch : %s\n", sys_uptime(),
nsurl_access(ctx->url));
-#endif
msg.type = FETCH_FINISHED;
fetch_file_send_callback(&msg, ctx);
}
@@ -447,9 +435,6 @@ fetch_file_process_aborted:
}
if (ctx->aborted == false) {
-#ifdef _TARGET_IS_KOLIBRIOS
- debug_board_printf("[%u] Finished file fetch : %s\n", sys_uptime(),
nsurl_access(ctx->url));
-#endif
msg.type = FETCH_FINISHED;
fetch_file_send_callback(&msg, ctx);
}
@@ -671,13 +656,7 @@ static void fetch_file_process_dir(struct
fetch_file_context *ctx,
int i; /* directory entry index */
int n; /* number of directory entries */
-#ifndef _TARGET_IS_KOLIBRIOS
n = scandir(ctx->path, &listing, 0, dir_sort_alpha);
-#else
- /* Don't have scandir yet */
- n = 1;
-#endif
-
if (n < 0) {
fetch_file_process_error(ctx,
fetch_file_errno_to_http_code(errno));
@@ -756,10 +735,6 @@ static void fetch_file_process_dir(struct
fetch_file_context *ctx,
if (fetch_file_send_callback(&msg, ctx))
goto fetch_file_process_dir_aborted;
-#ifdef _TARGET_IS_KOLIBRIOS
- debug_board_printf("[%u] Finished file fetch : %s\n", sys_uptime(),
nsurl_access(ctx->url));
-#endif
-
msg.type = FETCH_FINISHED;
fetch_file_send_callback(&msg, ctx);
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
