From 077ee0c9aa76f542d3c39f41ddba158fd7ace75b Mon Sep 17 00:00:00 2001 From: perry.werneck@gmail.com Date: Wed, 2 May 2012 12:15:45 +0000 Subject: [PATCH] Ajustando tradução na tela de help, incluindo lista de argumentos aceitos no popup de argumento inválido para facilitar o uso em windows, removendo macros para chamadas de log --- api.h | 6 +++--- glue.c | 2 +- host.c | 2 +- selection.c | 3 --- telnet.c | 4 +++- util.c | 2 +- w3miscc.h | 3 +-- 7 files changed, 10 insertions(+), 12 deletions(-) diff --git a/api.h b/api.h index e0d98c9..02a43bf 100644 --- a/api.h +++ b/api.h @@ -99,8 +99,8 @@ #include - #define WriteLog(module,fmt, ...) lib3270_write_log(NULL,module,fmt,__VA_ARGS__) - #define WriteRCLog(module,rc,fmt, ...) lib3270_write_rc(NULL,module,fmt,__VA_ARGS__) +// #define WriteLog(module,fmt, ...) lib3270_write_log(NULL,module,fmt,__VA_ARGS__) +// #define WriteRCLog(module,rc,fmt, ...) lib3270_write_rc(NULL,module,fmt,__VA_ARGS__) #ifdef LIB3270_MODULE_NAME #define Log(fmt, ...) lib3270_write_log(NULL,LIB3270_MODULE_NAME,fmt,__VA_ARGS__) @@ -367,7 +367,7 @@ LOCAL_EXTERN int emulate_input(char *s, int len, int pasting); /* Network related calls */ - LOCAL_EXTERN int Get3270Socket(void); +// LOCAL_EXTERN int Get3270Socket(void); /* Misc calls */ LOCAL_EXTERN void popup_an_error(H3270 *session, const char *fmt, ...); diff --git a/glue.c b/glue.c index 98926d9..74fb602 100644 --- a/glue.c +++ b/glue.c @@ -819,7 +819,7 @@ void popup_an_errno(int errn, const char *fmt, ...) (void) vsprintf(vmsgbuf, fmt, args); va_end(args); - WriteLog("3270", "Error Popup:\n%s\nrc=%d (%s)",vmsgbuf,errn,strerror(errn)); + lib3270_write_log("3270", "Error Popup:\n%s\nrc=%d (%s)",vmsgbuf,errn,strerror(errn)); Error(NULL,vmsgbuf); } diff --git a/host.c b/host.c index 9c082ed..c4a6f6f 100644 --- a/host.c +++ b/host.c @@ -645,7 +645,7 @@ int lib3270_connect(H3270 *h, const char *n, int wait) */ static void try_reconnect(H3270 *session) { - WriteLog("3270","Starting auto-reconnect (Host: %s)",session->full_current_host ? session->full_current_host : "-"); + lib3270_write_log("3270","Starting auto-reconnect (Host: %s)",session->full_current_host ? session->full_current_host : "-"); session->auto_reconnect_inprogress = False; lib3270_reconnect(session,0); } diff --git a/selection.c b/selection.c index c57af9d..aaa0e98 100644 --- a/selection.c +++ b/selection.c @@ -448,9 +448,6 @@ LIB3270_EXPORT char * lib3270_get_region(H3270 *h, int start_pos, int end_pos, u return realloc(text,sz); } - - - LIB3270_EXPORT char * lib3270_get_text(H3270 *h, int offset, int len) { char * buffer; diff --git a/telnet.c b/telnet.c index 3babbf5..9b9814b 100644 --- a/telnet.c +++ b/telnet.c @@ -3277,7 +3277,7 @@ static void client_info_callback(INFO_CONST SSL *s, int where, int ret) if (ret == 0) { trace_dsn("SSL_connect: failed in %s\n",SSL_state_string_long(s)); - WriteLog("SSL","connect failed in %s (Alert: %s)",SSL_state_string_long(s),SSL_alert_type_string_long(ret)); + lib3270_write_log("SSL","connect failed in %s (Alert: %s)",SSL_state_string_long(s),SSL_alert_type_string_long(ret)); } else if (ret < 0) { @@ -3452,7 +3452,9 @@ LIB3270_EXPORT int lib3270_get_ssl_state(H3270 *h) #endif } +/* int Get3270Socket(void) { return h3270.sock; } +*/ diff --git a/util.c b/util.c index 042b3ac..d914ae8 100644 --- a/util.c +++ b/util.c @@ -76,7 +76,7 @@ int get_version_info(void) info.dwOSVersionInfoSize = sizeof(info); if(GetVersionEx(&info) == 0) { - WriteLog("lib3270","%s","Can't get Windows version"); + lib3270_write_log("lib3270","%s","Can't get Windows version"); return -1; } diff --git a/w3miscc.h b/w3miscc.h index b87daa3..a774a24 100644 --- a/w3miscc.h +++ b/w3miscc.h @@ -19,8 +19,7 @@ #if defined(_WIN32) /*[*/ #if defined(_WS2TCPIP_H) /*[*/ -LIB3270_INTERNAL const char *inet_ntop(int af, const void *src, char *dst, - socklen_t cnt); +LIB3270_INTERNAL const char *inet_ntop(int af, const void *src, char *dst,socklen_t cnt); #endif /*]*/ LIB3270_INTERNAL const char *win32_strerror(int e); -- libgit2 0.21.2