From c738e9c11d4279d6de657a151eab86d531fbc2eb Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Thu, 27 Dec 2018 10:41:44 -0200 Subject: [PATCH] Updating libraries. --- android/jni/main.cpp | 2 +- android/jni/text.cpp | 2 +- modules/lib3270 | 2 +- modules/libv3270 | 2 +- src/libpw3270cpp/local.cc | 2 +- src/plugins/dbus3270/gobject.c | 2 +- src/plugins/hllapi/pluginmain.c | 2 +- src/sample/connect.c | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/android/jni/main.cpp b/android/jni/main.cpp index bfe9ae7..7e0387d 100644 --- a/android/jni/main.cpp +++ b/android/jni/main.cpp @@ -78,7 +78,7 @@ static void changed(H3270 *session, int offset, int len) trace("%s: offset=%d len=%d",__FUNCTION__,offset,len); { - char *text = lib3270_get_text(PW3270_SESSION,0,-1,'\n'); + char *text = lib3270_get_string_at_address(PW3270_SESSION,0,-1,'\n'); if(text) { char *strtok_r(char *str, const char *delim, char **saveptr); diff --git a/android/jni/text.cpp b/android/jni/text.cpp index 44fb1e8..c7cfcb9 100644 --- a/android/jni/text.cpp +++ b/android/jni/text.cpp @@ -76,7 +76,7 @@ JNIEXPORT jbyteArray JNICALL Java_br_com_bb_pw3270_lib3270_getText(JNIEnv *env, // trace("%s starts",__FUNCTION__); - char *text = lib3270_get_text(PW3270_SESSION,0,-1,'\n'); + char *text = lib3270_get_string_at_address(PW3270_SESSION,0,-1,'\n'); if(text) { diff --git a/modules/lib3270 b/modules/lib3270 index e787606..f5f6477 160000 --- a/modules/lib3270 +++ b/modules/lib3270 @@ -1 +1 @@ -Subproject commit e78760681ebc7c453f98930112e7f8c200f3049d +Subproject commit f5f647729298e6755ca1f20deb3d4fe5c50d6a36 diff --git a/modules/libv3270 b/modules/libv3270 index 9d93b60..acfaf4f 160000 --- a/modules/libv3270 +++ b/modules/libv3270 @@ -1 +1 @@ -Subproject commit 9d93b605c18add6e96226f2795c24f71e978df4d +Subproject commit acfaf4f5f20f89f7ceef7b92c9dd7da94417f0f6 diff --git a/src/libpw3270cpp/local.cc b/src/libpw3270cpp/local.cc index e2aa2e9..8ffd308 100644 --- a/src/libpw3270cpp/local.cc +++ b/src/libpw3270cpp/local.cc @@ -206,7 +206,7 @@ { (void **) & _pfkey, "lib3270_pfkey" }, { (void **) & _pakey, "lib3270_pakey" }, { (void **) & _wait_for_ready, "lib3270_wait_for_ready" }, - { (void **) & _get_text, "lib3270_get_text" }, + { (void **) & _get_text, "lib3270_get_string_at_address" }, { (void **) & _get_text_at, "lib3270_get_text_at" }, { (void **) & _cmp_text_at, "lib3270_cmp_text_at" }, { (void **) & _set_text_at, "lib3270_set_string_at" }, diff --git a/src/plugins/dbus3270/gobject.c b/src/plugins/dbus3270/gobject.c index 4b245b3..b7e4390 100644 --- a/src/plugins/dbus3270/gobject.c +++ b/src/plugins/dbus3270/gobject.c @@ -226,7 +226,7 @@ void pw3270_dbus_get_screen_contents(PW3270Dbus *object, DBusGMethodInvocation * if(pw3270_dbus_check_valid_state(object,context)) return; - text = lib3270_get_text(hSession,0,-1,'\n'); + text = lib3270_get_string_at_address(hSession,0,-1,'\n'); utftext = g_convert_with_fallback(text,-1,"UTF-8",lib3270_get_display_charset(hSession),"?",NULL,NULL,NULL); diff --git a/src/plugins/hllapi/pluginmain.c b/src/plugins/hllapi/pluginmain.c index cc9b21b..e2187ee 100644 --- a/src/plugins/hllapi/pluginmain.c +++ b/src/plugins/hllapi/pluginmain.c @@ -305,7 +305,7 @@ break; case HLLAPI_PACKET_GET_TEXT_AT_OFFSET: - send_text(source,lib3270_get_text( lib3270_get_default_session_handle(), + send_text(source,lib3270_get_string_at_address( lib3270_get_default_session_handle(), ((struct hllapi_packet_query_offset *) source->buffer)->addr, ((struct hllapi_packet_query_offset *) source->buffer)->len, ((struct hllapi_packet_query_offset *) source->buffer)->lf)); diff --git a/src/sample/connect.c b/src/sample/connect.c index 0e82fc0..fd8f6a7 100644 --- a/src/sample/connect.c +++ b/src/sample/connect.c @@ -70,7 +70,7 @@ else { /* Host is ready, get screen contents */ - char *text = lib3270_get_text(hSession,0,-1); + char *text = lib3270_get_string_at_address(hSession,0,-1); printf("\nScreen contents:\n%s\n",text); -- libgit2 0.21.2