From 0d811963c1498aa625b5438bf66dbb677a0d4494 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Thu, 28 May 2015 17:06:18 +0100 Subject: fixup all the remaining logging macro callsites The semantic patch tool appears to have missed some difficult to reason about callsites which have now been manually cleaned up --- atari/deskmenu.c | 52 ++++++++++++++++++++++++++-------------------------- atari/verify_ssl.c | 2 +- 2 files changed, 27 insertions(+), 27 deletions(-) (limited to 'atari') diff --git a/atari/deskmenu.c b/atari/deskmenu.c index eeffacea6..c2994cefa 100644 --- a/atari/deskmenu.c +++ b/atari/deskmenu.c @@ -178,7 +178,7 @@ static void __CDECL menu_about(short item, short title, void *data) nserror error; char buf[PATH_MAX]; - LOG(("%s", __FUNCTION__)); + LOG("%s", __FUNCTION__); strcpy((char*)&buf, "file://"); strncat((char*)&buf, (char*)"./doc/README.TXT", PATH_MAX - (strlen("file://")+1) ); @@ -205,7 +205,7 @@ static void __CDECL menu_new_win(short item, short title, void *data) nserror error; const char *addr; - LOG(("%s", __FUNCTION__)); + LOG("%s", __FUNCTION__); if (nsoption_charp(homepage_url) != NULL) { addr = nsoption_charp(homepage_url); @@ -233,7 +233,7 @@ static void __CDECL menu_open_url(short item, short title, void *data) { struct gui_window * gw; struct browser_window * bw ; - LOG(("%s", __FUNCTION__)); + LOG("%s", __FUNCTION__); gw = input_window; if( gw == NULL ) { @@ -248,7 +248,7 @@ static void __CDECL menu_open_url(short item, short title, void *data) static void __CDECL menu_open_file(short item, short title, void *data) { - LOG(("%s", __FUNCTION__)); + LOG("%s", __FUNCTION__); const char * filename = file_select(messages_get("OpenFile"), ""); if( filename != NULL ){ @@ -277,7 +277,7 @@ static void __CDECL menu_open_file(short item, short title, void *data) static void __CDECL menu_close_win(short item, short title, void *data) { - LOG(("%s", __FUNCTION__)); + LOG("%s", __FUNCTION__); if( input_window == NULL ) return; gui_window_destroy( input_window ); @@ -285,7 +285,7 @@ static void __CDECL menu_close_win(short item, short title, void *data) static void __CDECL menu_save_page(short item, short title, void *data) { - LOG(("%s", __FUNCTION__)); + LOG("%s", __FUNCTION__); static bool init = true; bool is_folder=false; const char * path; @@ -316,7 +316,7 @@ static void __CDECL menu_quit(short item, short title, void *data) { short buff[8]; memset( &buff, 0, sizeof(short)*8 ); - LOG(("%s", __FUNCTION__)); + LOG("%s", __FUNCTION__); gemtk_wm_send_msg(NULL, AP_TERM, 0, 0, 0, 0); } @@ -328,21 +328,21 @@ static void __CDECL menu_cut(short item, short title, void *data) static void __CDECL menu_copy(short item, short title, void *data) { - LOG(("%s", __FUNCTION__)); + LOG("%s", __FUNCTION__); if( input_window != NULL ) browser_window_key_press( input_window->browser->bw, NS_KEY_COPY_SELECTION); } static void __CDECL menu_paste(short item, short title, void *data) { - LOG(("%s", __FUNCTION__)); + LOG("%s", __FUNCTION__); if( input_window != NULL ) browser_window_key_press( input_window->browser->bw, NS_KEY_PASTE); } static void __CDECL menu_find(short item, short title, void *data) { - LOG(("%s", __FUNCTION__)); + LOG("%s", __FUNCTION__); if (input_window != NULL) { if (input_window->search) { window_close_search(input_window->root); @@ -355,13 +355,13 @@ static void __CDECL menu_find(short item, short title, void *data) static void __CDECL menu_choices(short item, short title, void *data) { - LOG(("%s", __FUNCTION__)); + LOG("%s", __FUNCTION__); open_settings(); } static void __CDECL menu_stop(short item, short title, void *data) { - LOG(("%s", __FUNCTION__)); + LOG("%s", __FUNCTION__); if( input_window == NULL ) return; @@ -375,7 +375,7 @@ static void __CDECL menu_reload(short item, short title, void *data) if(input_window == NULL) return; toolbar_reload_click(input_window->root->toolbar); - LOG(("%s", __FUNCTION__)); + LOG("%s", __FUNCTION__); } @@ -405,7 +405,7 @@ static void __CDECL menu_dec_scale(short item, short title, void *data) static void __CDECL menu_toolbars(short item, short title, void *data) { static int state = 0; - LOG(("%s", __FUNCTION__)); + LOG("%s", __FUNCTION__); if( input_window != null && input_window->root->toolbar != null ){ state = !state; // TODO: implement toolbar hide @@ -415,7 +415,7 @@ static void __CDECL menu_toolbars(short item, short title, void *data) static void __CDECL menu_savewin(short item, short title, void *data) { - LOG(("%s", __FUNCTION__)); + LOG("%s", __FUNCTION__); if (input_window && input_window->browser) { GRECT rect; wind_get_grect(gemtk_wm_get_handle(input_window->root->win), WF_CURRXYWH, @@ -435,7 +435,7 @@ static void __CDECL menu_savewin(short item, short title, void *data) static void __CDECL menu_debug_render(short item, short title, void *data) { - LOG(("%s", __FUNCTION__)); + LOG("%s", __FUNCTION__); html_redraw_debug = !html_redraw_debug; if( input_window != NULL ) { if ( input_window->browser != NULL @@ -466,7 +466,7 @@ static void __CDECL menu_bg_images(short item, short title, void *data) static void __CDECL menu_back(short item, short title, void *data) { - LOG(("%s", __FUNCTION__)); + LOG("%s", __FUNCTION__); if( input_window == NULL ) return; toolbar_back_click(input_window->root->toolbar); @@ -474,7 +474,7 @@ static void __CDECL menu_back(short item, short title, void *data) static void __CDECL menu_forward(short item, short title, void *data) { - LOG(("%s", __FUNCTION__)); + LOG("%s", __FUNCTION__); if( input_window == NULL ) return; toolbar_forward_click(input_window->root->toolbar); @@ -482,7 +482,7 @@ static void __CDECL menu_forward(short item, short title, void *data) static void __CDECL menu_home(short item, short title, void *data) { - LOG(("%s", __FUNCTION__)); + LOG("%s", __FUNCTION__); if( input_window == NULL ) return; toolbar_home_click(input_window->root->toolbar); @@ -490,20 +490,20 @@ static void __CDECL menu_home(short item, short title, void *data) static void __CDECL menu_lhistory(short item, short title, void *data) { - LOG(("%s", __FUNCTION__)); + LOG("%s", __FUNCTION__); if( input_window == NULL ) return; } static void __CDECL menu_ghistory(short item, short title, void *data) { - LOG(("%s", __FUNCTION__)); + LOG("%s", __FUNCTION__); atari_global_history_open(); } static void __CDECL menu_add_bookmark(short item, short title, void *data) { - LOG(("%s", __FUNCTION__)); + LOG("%s", __FUNCTION__); if (input_window) { if( browser_window_has_content(input_window->browser->bw) ){ atari_hotlist_add_page( @@ -516,26 +516,26 @@ static void __CDECL menu_add_bookmark(short item, short title, void *data) static void __CDECL menu_bookmarks(short item, short title, void *data) { - LOG(("%s", __FUNCTION__)); + LOG("%s", __FUNCTION__); atari_hotlist_open(); } static void __CDECL menu_cookies(short item, short title, void *data) { - LOG(("%s", __FUNCTION__)); + LOG("%s", __FUNCTION__); atari_cookie_manager_open(); } static void __CDECL menu_vlog(short item, short title, void *data) { - LOG(("%s", __FUNCTION__)); + LOG("%s", __FUNCTION__); verbose_log = !verbose_log; menu_icheck(h_gem_menu, MAINMENU_M_VLOG, (verbose_log) ? 1 : 0); } static void __CDECL menu_help_content(short item, short title, void *data) { - LOG(("%s", __FUNCTION__)); + LOG("%s", __FUNCTION__); } /* diff --git a/atari/verify_ssl.c b/atari/verify_ssl.c index 8b7525a4c..cbd9d0bf6 100644 --- a/atari/verify_ssl.c +++ b/atari/verify_ssl.c @@ -81,7 +81,7 @@ static void __CDECL cert_info_draw( WINDOW * win, short buf[8], void * data) if( line == NULL ) return; - LOG(("Cert info draw, win: %p, data: %p, scrollx: %d", win, data, dp->scrollx )); + LOG("Cert info draw, win: %p, data: %p, scrollx: %d", win, data, dp->scrollx ); WindGet( win, WF_WORKXYWH, &x, &y, &w, &h ); /*using static values here, as RsrcUserDraw has mem leaks & a very small stack */ -- cgit v1.2.3