Commit 5d6f189d authored by Vincent Sanders's avatar Vincent Sanders

Fixup everything the semantic patch missed

parent 2b0a5ef2
......@@ -770,7 +770,7 @@ void content_broadcast(struct content *c, content_msg msg,
struct content_user *user, *next;
assert(c);
// LOG("%p -> msg:%d", c, msg);
NSLOG(netsurf, DEEPDEBUG, "%p -> msg:%d", c, msg);
for (user = c->user_list->next; user != 0; user = next) {
next = user->next; /* user may be destroyed during callback */
if (user->callback != 0)
......
......@@ -1153,12 +1153,12 @@ build_entrymap(struct store_state *state)
state->total_alloc = 0;
for (eloop = 1; eloop < state->last_entry; eloop++) {
/*
LOG("entry:%d ident:0x%08x used:%d",
eloop,
BS_ADDRESS(state->entries[eloop].ident, state),
state->entries[eloop].use_count);
*/
NSLOG(llcache, DEEPDEBUG,
"entry:%d ident:0x%08x used:%d",
eloop,
BS_ADDRESS(state->entries[eloop].ident, state),
state->entries[eloop].use_count);
/* update the address map to point at the entry */
BS_ENTRY_INDEX(state->entries[eloop].ident, state) = eloop;
......
......@@ -602,8 +602,12 @@ static inline struct BitMap *ami_bitmap_get_generic(struct bitmap *bitmap,
TAG_DONE);
if (err != COMPERR_Success) {
LOG("Composite error %ld - falling back", err);
/* If it failed, do it again the way which works in software */
NSLOG(netsurf, INFO,
"Composite error %ld - falling back",
err);
/* If it failed, do it again the way
* which works in software
*/
#else
{
#endif
......@@ -617,7 +621,8 @@ static inline struct BitMap *ami_bitmap_get_generic(struct bitmap *bitmap,
COMPTAG_FriendBitMap, scrn->RastPort.BitMap,
TAG_DONE);
/* If it still fails... it's non-fatal */
LOG("Fallback returned error %ld", err);
NSLOG(netsurf, INFO,
"Fallback returned error %ld", err);
}
} else /* Do it the old-fashioned way. This is pretty slow, even on OS4.1 */
#endif
......
......@@ -526,7 +526,8 @@ HOOKF(void, ami_cw_idcmp_hook, Object *, object, struct IntuiMessage *)
break;
default:
LOG("IDCMP hook unhandled event: %ld", msg->Class);
NSLOG(netsurf, INFO,
"IDCMP hook unhandled event: %ld", msg->Class);
break;
}
}
......
......@@ -3863,7 +3863,8 @@ HOOKF(void, ami_scroller_hook, Object *, object, struct IntuiMessage *)
break;
default:
LOG("IDCMP hook unhandled event: %ld", msg->Class);
NSLOG(netsurf, INFO,
"IDCMP hook unhandled event: %ld", msg->Class);
break;
}
// ReplyMsg((struct Message *)msg);
......
......@@ -56,11 +56,11 @@
#ifdef __amigaos4__
#define AMINS_LIB_OPEN(LIB, LIBVER, PREFIX, INTERFACE, INTVER, FAIL) \
LOG("Opening %s v%d", LIB, LIBVER); \
NSLOG(netsurf, INFO, "Opening %s v%d", LIB, LIBVER); \
if((PREFIX##Base = (struct PREFIX##Base *)OpenLibrary(LIB, LIBVER))) { \
I##PREFIX = (struct PREFIX##IFace *)GetInterface((struct Library *)PREFIX##Base, INTERFACE, INTVER, NULL); \
if(I##PREFIX == NULL) { \
LOG("Failed to get %s interface v%d of %s", INTERFACE, INTVER, LIB); \
NSLOG(netsurf, INFO, "Failed to get %s interface v%d of %s", INTERFACE, INTVER, LIB); \
AMINS_LIB_CLOSE(PREFIX) \
if(FAIL == true) { \
STRPTR error = ASPrintf("Unable to open interface %s v%d\nof %s v%ld (fatal error - not an OS4 lib?)", INTERFACE, INTVER, LIB, LIBVER); \
......@@ -70,7 +70,7 @@
} \
} \
} else { \
LOG("Failed to open %s v%d", LIB, LIBVER); \
NSLOG(netsurf, INFO, "Failed to open %s v%d", LIB, LIBVER); \
if(FAIL == true) { \
STRPTR error = ASPrintf("Unable to open %s v%ld (fatal error)", LIB, LIBVER); \
ami_misc_fatal_error(error); \
......@@ -90,13 +90,13 @@
struct PREFIX##IFace *I##PREFIX = NULL;
#define AMINS_CLASS_OPEN(CLASS, CLASSVER, PREFIX, CLASSGET, NEEDINTERFACE) \
LOG("Opening %s v%d", CLASS, CLASSVER); \
NSLOG(netsurf, INFO, "Opening %s v%d", CLASS, CLASSVER); \
if((PREFIX##Base = OpenClass(CLASS, CLASSVER, &PREFIX##Class))) { \
if(NEEDINTERFACE == true) { \
LOG(" + interface"); \
NSLOG(netsurf, INFO, " + interface"); \
I##PREFIX = (struct PREFIX##IFace *)GetInterface((struct Library *)PREFIX##Base, "main", 1, NULL); \
if(I##PREFIX == NULL) { \
LOG("Failed to get main interface v1 of %s", CLASS); \
NSLOG(netsurf, INFO, "Failed to get main interface v1 of %s", CLASS); \
} \
} \
} \
......@@ -118,10 +118,10 @@
#else
#define AMINS_LIB_OPEN(LIB, LIBVER, PREFIX, INTERFACE, INTVER, FAIL) \
LOG("Opening %s v%d", LIB, LIBVER); \
NSLOG(netsurf, INFO, "Opening %s v%d", LIB, LIBVER); \
if((PREFIX##Base = (struct PREFIX##Base *)OpenLibrary(LIB, LIBVER))) { \
} else { \
LOG("Failed to open %s v%d", LIB, LIBVER); \
NSLOG(netsurf, INFO, "Failed to open %s v%d", LIB, LIBVER); \
if(FAIL == true) { \
STRPTR error = ASPrintf("Unable to open %s v%d (fatal error)", LIB, LIBVER); \
ami_misc_fatal_error(error); \
......@@ -137,7 +137,7 @@
struct PREFIX##Base *PREFIX##Base = NULL;
#define AMINS_CLASS_OPEN(CLASS, CLASSVER, PREFIX, CLASSGET, NEEDINTERFACE) \
LOG("Opening %s v%d", CLASS, CLASSVER); \
NSLOG(netsurf, INFO, "Opening %s v%d", CLASS, CLASSVER); \
if((PREFIX##Base = OpenLibrary(CLASS, CLASSVER))) { \
PREFIX##Class = CLASSGET##_GetClass(); \
} \
......
......@@ -263,7 +263,9 @@ static int ami_menu_layout_mc_recursive(Object *menu_parent, struct ami_menu_dat
TAG_DONE);
}
//LOG("Adding item %p ID %d (%s) to parent %p", menu_item, j, md[j]->menulab, menu_parent);
NSLOG(netsurf, DEEPDEBUG,
"Adding item %p ID %d (%s) to parent %p",
menu_item, j, md[j]->menulab, menu_parent);
IDoMethod(menu_parent, OM_ADDMEMBER, menu_item);
continue;
} else if (md[j]->menutype > level) {
......
......@@ -181,7 +181,7 @@ static void __CDECL menu_about(short item, short title, void *data)
nserror error;
char buf[PATH_MAX];
LOG("%s", __FUNCTION__);
NSLOG(netsurf, INFO, "abort menu");
strcpy((char*)&buf, "file://");
strncat((char*)&buf, (char*)"./doc/README.TXT",
PATH_MAX - (strlen("file://")+1) );
......
......@@ -204,8 +204,8 @@ static nserror beos_font_position(const plot_font_style_t *fstyle,
const char *string, size_t length,
int x, size_t *char_offset, int *actual_x)
{
//LOG("(, '%s', %d, %d, , )", string, length, x);
//fprintf(stderr, "%s(, '%s', %d, %d, , )\n", __FUNCTION__, string, length, x);
NSLOG(netsurf, DEEPDEBUG, "(, '%s', %d, %d, , )", string, length, x);
int index;
BFont font;
......@@ -261,8 +261,7 @@ static nserror beos_font_split(const plot_font_style_t *fstyle,
const char *string, size_t length,
int x, size_t *char_offset, int *actual_x)
{
//fprintf(stderr, "%s(, '%s', %d, %d, , )\n", __FUNCTION__, string, length, x);
//LOG("(, '%s', %d, %d, , )", string, length, x);
NSLOG(netsurf, DEEPDEBUG, "(, '%s', %d, %d, , )", string, length, x);
int index = 0;
BFont font;
......
......@@ -764,17 +764,21 @@ void nsbeos_gui_poll(void)
timeout.tv_sec = (long)(next_schedule / 1000000LL);
timeout.tv_usec = (long)(next_schedule % 1000000LL);
//LOG("gui_poll: select(%d, ..., %Ldus", max_fd, next_schedule);
NSLOG(netsurf, DEEPDEBUG,
"gui_poll: select(%d, ..., %Ldus",
max_fd, next_schedule);
fd_count = select(max_fd, &read_fd_set, &write_fd_set, &exc_fd_set,
&timeout);
//LOG("select: %d\n", fd_count);
NSLOG(netsurf, DEEPDEBUG, "select: %d\n", fd_count);
if (fd_count > 0 && FD_ISSET(sEventPipe[0], &read_fd_set)) {
BMessage *message;
int len = read(sEventPipe[0], &message, sizeof(void *));
//LOG("gui_poll: BMessage ? %d read", len);
NSLOG(netsurf, DEEPDEBUG, "gui_poll: BMessage ? %d read", len);
if (len == sizeof(void *)) {
//LOG("gui_poll: BMessage.what %-4.4s\n", &(message->what));
NSLOG(netsurf, DEEPDEBUG,
"gui_poll: BMessage.what %-4.4s\n",
&(message->what));
nsbeos_dispatch_event(message);
}
}
......
......@@ -457,7 +457,7 @@ void nsbeos_dispatch_event(BMessage *message)
return;
}
//LOG("processing message");
NSLOG(netsurf, DEEPDEBUG, "processing message");
switch (message->what) {
case B_QUIT_REQUESTED:
// from the BApplication
......
......@@ -84,9 +84,10 @@ nsfont_width(const plot_font_style_t *fstyle,
pango_layout_get_pixel_size(nsfont_pango_layout, width, 0);
/* LOG("fstyle: %p string:\"%.*s\", length: %u, width: %dpx",
fstyle, length, string, length, *width);
*/
NSLOG(netsurf, DEEPDEBUG,
"fstyle: %p string:\"%.*s\", length: %u, width: %dpx",
fstyle, length, string, length, *width);
return NSERROR_OK;
}
......
......@@ -202,7 +202,8 @@ init_resource(char **respath, struct nsgtk_resource_s *resource)
resource->path);
return NSERROR_OK;
}
/*LOG("gresource \"%s\" not found", resname);*/
NSLOG(netsurf, DEEPDEBUG,
"gresource \"%s\" not found", resname);
free(resname);
langc++;
......@@ -226,7 +227,7 @@ init_resource(char **respath, struct nsgtk_resource_s *resource)
resource->path);
return NSERROR_OK;
}
/*LOG("gresource \"%s\" not found", resname);*/
NSLOG(netsurf, DEEPDEBUG, "gresource \"%s\" not found", resname);*/
free(resname);
#endif
......
......@@ -150,8 +150,9 @@ void ro_gui_options_image_redraw(wimp_draw *redraw)
icon_state.i = IMAGE_CURRENT_DISPLAY;
error = xwimp_get_icon_state(&icon_state);
if (error) {
LOG("xwimp_get_icon_state: 0x%x: %s",
error->errnum, error->errmess);
NSLOG(netsurf, INFO,
"xwimp_get_icon_state: 0x%x: %s",
error->errnum, error->errmess);
ro_warn_user("MenuError", error->errmess);
return;
}
......
......@@ -274,8 +274,10 @@ set_colour_from_wimp(struct nsoption_s *opts,
error = xwimp_read_true_palette((os_palette *) &palette);
if (error != NULL) {
LOG("xwimp_read_palette: 0x%x: %s",
error->errnum, error->errmess);
NSLOG(netsurf, INFO,
"xwimp_read_palette: 0x%x: %s",
error->errnum,
error->errmess);
} else {
/* entries are in B0G0R0LL */
def_colour = palette.entries[wimp] >> 8;
......
......@@ -482,7 +482,7 @@ void ro_gui_selection_data_request(wimp_full_message_data_request *req)
// bits ftype = req->file_types[i];
// if (ftype == ~0U) break; /* list terminator */
//
// LOG("type %x", ftype);
// NSLOG(netsurf, INFO, "type %x", ftype);
// i++;
// }
......
......@@ -16,8 +16,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/** \file
* Window themes (implementation).
/**
* \file
* Window themes implementation.
*/
#include <alloca.h>
......@@ -180,8 +181,10 @@ static void ro_gui_theme_get_available_in_dir(const char *directory)
(osgbpb_info_list *) &info, 1, context,
sizeof(info), 0, &read_count, &context);
if (error) {
LOG("xosgbpb_dir_entries_info: 0x%x: %s",
error->errnum, error->errmess);
NSLOG(netsurf, INFO,
"xosgbpb_dir_entries_info: 0x%x: %s",
error->errnum,
error->errmess);
if (error->errnum == 0xd6) /* no such dir */
return;
ro_warn_user("MiscError", error->errmess);
......
......@@ -309,10 +309,11 @@ win32_font_split(const plot_font_style_t *style,
}
}
/*
LOG("ret %d Split %u chars at %ipx: Split at char %i (%ipx) - %.*s",
ret, length, x, *char_offset, *actual_x, *char_offset, string);
*/
NSLOG(netsurf, DEEPDEBUG,
"ret %d Split %u chars at %ipx: Split at char %i (%ipx) - %.*s",
ret, length, x, *char_offset, *actual_x, *char_offset, string);
return ret;
}
......
......@@ -24,11 +24,13 @@
const char *msg_num_to_name(int msg);
void win_perror(const char *lpszFunction);
#define LOG_WIN_MSG(h, m, w, l) \
if (((m) != WM_SETCURSOR) && \
((m) != WM_MOUSEMOVE) && \
((m) != WM_NCHITTEST) && \
((m) != WM_ENTERIDLE)) \
LOG("%s, hwnd %p, w 0x%x, l 0x%Ix", msg_num_to_name(m), h, w, l);
#define LOG_WIN_MSG(h, m, w, l) \
if (((m) != WM_SETCURSOR) && \
((m) != WM_MOUSEMOVE) && \
((m) != WM_NCHITTEST) && \
((m) != WM_ENTERIDLE)) \
NSLOG(netsurf, INFO, \
"%s, hwnd %p, w 0x%x, l 0x%Ix", \
msg_num_to_name(m), h, w, l)
#endif
......@@ -163,7 +163,8 @@ static HWND nsws_window_create(HINSTANCE hInstance, struct gui_window *gw)
gw->mainmenu = LoadMenu(hInstance, MAKEINTRESOURCE(IDR_MENU_MAIN));
gw->rclick = LoadMenu(hInstance, MAKEINTRESOURCE(IDR_MENU_CONTEXT));
NSLOG(netsurf, INFO, "creating hInstance %p GUI window %p",
NSLOG(netsurf, INFO,
"creating hInstance %p GUI window %p",
hInstance, gw);
hwnd = CreateWindowEx(0,
windowclassname_main,
......@@ -195,7 +196,8 @@ static HWND nsws_window_create(HINSTANCE hInstance, struct gui_window *gw)
(nsoption_int(window_height) >= 100) &&
(nsoption_int(window_x) >= 0) &&
(nsoption_int(window_y) >= 0)) {
NSLOG(netsurf, INFO, "Setting Window position %d,%d %d,%d",
NSLOG(netsurf, INFO,
"Setting Window position %d,%d %d,%d",
nsoption_int(window_x), nsoption_int(window_y),
nsoption_int(window_width), nsoption_int(window_height));
SetWindowPos(hwnd, HWND_TOP,
......@@ -1879,7 +1881,9 @@ nserror win32_window_set_scroll(struct gui_window *gw, const struct rect *rect)
gw->requestscrolly = rect->y0 - gw->scrolly;
}
/*LOG("requestscroll x,y:%d,%d", w->requestscrollx, w->requestscrolly);*/
NSLOG(netsurf, DEEPDEBUG,
"requestscroll x,y:%d,%d",
w->requestscrollx, w->requestscrolly);
/* set the vertical scroll offset */
si.cbSize = sizeof(si);
......@@ -1890,7 +1894,9 @@ nserror win32_window_set_scroll(struct gui_window *gw, const struct rect *rect)
si.nPos = max(gw->scrolly + gw->requestscrolly, 0);
si.nPos = min(si.nPos, height - gw->height);
SetScrollInfo(gw->drawingarea, SB_VERT, &si, TRUE);
/*LOG("SetScrollInfo VERT min:%d max:%d page:%d pos:%d", si.nMin, si.nMax, si.nPage, si.nPos);*/
NSLOG(netsurf, DEEPDEBUG,
"SetScrollInfo VERT min:%d max:%d page:%d pos:%d",
si.nMin, si.nMax, si.nPage, si.nPos);
/* set the horizontal scroll offset */
si.cbSize = sizeof(si);
......@@ -1901,7 +1907,9 @@ nserror win32_window_set_scroll(struct gui_window *gw, const struct rect *rect)
si.nPos = max(gw->scrollx + gw->requestscrollx, 0);
si.nPos = min(si.nPos, width - gw->width);
SetScrollInfo(gw->drawingarea, SB_HORZ, &si, TRUE);
/*LOG("SetScrollInfo HORZ min:%d max:%d page:%d pos:%d", si.nMin, si.nMax, si.nPage, si.nPos);*/
NSLOG(netsurf, DEEPDEBUG,
"SetScrollInfo HORZ min:%d max:%d page:%d pos:%d",
si.nMin, si.nMax, si.nPage, si.nPos);
/* Set caret position */
GetCaretPos(&p);
......@@ -1915,7 +1923,9 @@ nserror win32_window_set_scroll(struct gui_window *gw, const struct rect *rect)
r.left = 0;
r.right = gw->width + 1;
ScrollWindowEx(gw->drawingarea, - gw->requestscrollx, - gw->requestscrolly, &r, NULL, NULL, &redraw, SW_INVALIDATE);
/*LOG("ScrollWindowEx %d, %d", - w->requestscrollx, - w->requestscrolly);*/
NSLOG(netsurf, DEEPDEBUG,
"ScrollWindowEx %d, %d",
- w->requestscrollx, - w->requestscrolly);
gw->scrolly += gw->requestscrolly;
gw->scrollx += gw->requestscrollx;
gw->requestscrollx = 0;
......
......@@ -769,7 +769,7 @@ dom_event_fetcher(dom_string *type,
dom_default_action_phase phase,
void **pw)
{
//LOG("type:%s", dom_string_data(type));
NSLOG(netsurf, DEEPDEBUG, "type:%s", dom_string_data(type));
if (phase == DOM_DEFAULT_ACTION_END) {
if (dom_string_isequal(type, corestring_dom_DOMNodeInserted)) {
......
......@@ -187,28 +187,44 @@ static inline void nsurl__components_destroy(struct nsurl_components *c)
static inline void nsurl__dump(const nsurl *url)
{
if (url->components.scheme)
LOG(" Scheme: %s", lwc_string_data(url->components.scheme));
NSLOG(netsurf, INFO,netsurf, INFO,
" Scheme: %s",
lwc_string_data(url->components.scheme));
if (url->components.username)
LOG("Username: %s", lwc_string_data(url->components.username));
NSLOG(netsurf, INFO,
"Username: %s",
lwc_string_data(url->components.username));
if (url->components.password)
LOG("Password: %s", lwc_string_data(url->components.password));
NSLOG(netsurf, INFO,
"Password: %s",
lwc_string_data(url->components.password));
if (url->components.host)
LOG(" Host: %s", lwc_string_data(url->components.host));
NSLOG(netsurf, INFO,
" Host: %s",
lwc_string_data(url->components.host));
if (url->components.port)
LOG(" Port: %s", lwc_string_data(url->components.port));
NSLOG(netsurf, INFO,
" Port: %s",
lwc_string_data(url->components.port));
if (url->components.path)
LOG(" Path: %s", lwc_string_data(url->components.path));
NSLOG(netsurf, INFO,
" Path: %s",
lwc_string_data(url->components.path));
if (url->components.query)
LOG(" Query: %s", lwc_string_data(url->components.query));
NSLOG(netsurf, INFO,
" Query: %s",
lwc_string_data(url->components.query));
if (url->components.fragment)
LOG("Fragment: %s", lwc_string_data(url->components.fragment));
NSLOG(netsurf, INFO,
"Fragment: %s",
lwc_string_data(url->components.fragment));
}
#endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment