Commit c738e9c11d4279d6de657a151eab86d531fbc2eb

Authored by Perry Werneck
1 parent 28828f1d

Updating libraries.

android/jni/main.cpp
@@ -78,7 +78,7 @@ static void changed(H3270 *session, int offset, int len) @@ -78,7 +78,7 @@ static void changed(H3270 *session, int offset, int len)
78 trace("%s: offset=%d len=%d",__FUNCTION__,offset,len); 78 trace("%s: offset=%d len=%d",__FUNCTION__,offset,len);
79 79
80 { 80 {
81 - char *text = lib3270_get_text(PW3270_SESSION,0,-1,'\n'); 81 + char *text = lib3270_get_string_at_address(PW3270_SESSION,0,-1,'\n');
82 if(text) 82 if(text)
83 { 83 {
84 char *strtok_r(char *str, const char *delim, char **saveptr); 84 char *strtok_r(char *str, const char *delim, char **saveptr);
android/jni/text.cpp
@@ -76,7 +76,7 @@ JNIEXPORT jbyteArray JNICALL Java_br_com_bb_pw3270_lib3270_getText(JNIEnv *env, @@ -76,7 +76,7 @@ JNIEXPORT jbyteArray JNICALL Java_br_com_bb_pw3270_lib3270_getText(JNIEnv *env,
76 76
77 // trace("%s starts",__FUNCTION__); 77 // trace("%s starts",__FUNCTION__);
78 78
79 - char *text = lib3270_get_text(PW3270_SESSION,0,-1,'\n'); 79 + char *text = lib3270_get_string_at_address(PW3270_SESSION,0,-1,'\n');
80 80
81 if(text) 81 if(text)
82 { 82 {
modules/lib3270
1 -Subproject commit e78760681ebc7c453f98930112e7f8c200f3049d 1 +Subproject commit f5f647729298e6755ca1f20deb3d4fe5c50d6a36
modules/libv3270
1 -Subproject commit 9d93b605c18add6e96226f2795c24f71e978df4d 1 +Subproject commit acfaf4f5f20f89f7ceef7b92c9dd7da94417f0f6
src/libpw3270cpp/local.cc
@@ -206,7 +206,7 @@ @@ -206,7 +206,7 @@
206 { (void **) & _pfkey, "lib3270_pfkey" }, 206 { (void **) & _pfkey, "lib3270_pfkey" },
207 { (void **) & _pakey, "lib3270_pakey" }, 207 { (void **) & _pakey, "lib3270_pakey" },
208 { (void **) & _wait_for_ready, "lib3270_wait_for_ready" }, 208 { (void **) & _wait_for_ready, "lib3270_wait_for_ready" },
209 - { (void **) & _get_text, "lib3270_get_text" }, 209 + { (void **) & _get_text, "lib3270_get_string_at_address" },
210 { (void **) & _get_text_at, "lib3270_get_text_at" }, 210 { (void **) & _get_text_at, "lib3270_get_text_at" },
211 { (void **) & _cmp_text_at, "lib3270_cmp_text_at" }, 211 { (void **) & _cmp_text_at, "lib3270_cmp_text_at" },
212 { (void **) & _set_text_at, "lib3270_set_string_at" }, 212 { (void **) & _set_text_at, "lib3270_set_string_at" },
src/plugins/dbus3270/gobject.c
@@ -226,7 +226,7 @@ void pw3270_dbus_get_screen_contents(PW3270Dbus *object, DBusGMethodInvocation * @@ -226,7 +226,7 @@ void pw3270_dbus_get_screen_contents(PW3270Dbus *object, DBusGMethodInvocation *
226 if(pw3270_dbus_check_valid_state(object,context)) 226 if(pw3270_dbus_check_valid_state(object,context))
227 return; 227 return;
228 228
229 - text = lib3270_get_text(hSession,0,-1,'\n'); 229 + text = lib3270_get_string_at_address(hSession,0,-1,'\n');
230 230
231 utftext = g_convert_with_fallback(text,-1,"UTF-8",lib3270_get_display_charset(hSession),"?",NULL,NULL,NULL); 231 utftext = g_convert_with_fallback(text,-1,"UTF-8",lib3270_get_display_charset(hSession),"?",NULL,NULL,NULL);
232 232
src/plugins/hllapi/pluginmain.c
@@ -305,7 +305,7 @@ @@ -305,7 +305,7 @@
305 break; 305 break;
306 306
307 case HLLAPI_PACKET_GET_TEXT_AT_OFFSET: 307 case HLLAPI_PACKET_GET_TEXT_AT_OFFSET:
308 - send_text(source,lib3270_get_text( lib3270_get_default_session_handle(), 308 + send_text(source,lib3270_get_string_at_address( lib3270_get_default_session_handle(),
309 ((struct hllapi_packet_query_offset *) source->buffer)->addr, 309 ((struct hllapi_packet_query_offset *) source->buffer)->addr,
310 ((struct hllapi_packet_query_offset *) source->buffer)->len, 310 ((struct hllapi_packet_query_offset *) source->buffer)->len,
311 ((struct hllapi_packet_query_offset *) source->buffer)->lf)); 311 ((struct hllapi_packet_query_offset *) source->buffer)->lf));
src/sample/connect.c
@@ -70,7 +70,7 @@ @@ -70,7 +70,7 @@
70 else 70 else
71 { 71 {
72 /* Host is ready, get screen contents */ 72 /* Host is ready, get screen contents */
73 - char *text = lib3270_get_text(hSession,0,-1); 73 + char *text = lib3270_get_string_at_address(hSession,0,-1);
74 74
75 printf("\nScreen contents:\n%s\n",text); 75 printf("\nScreen contents:\n%s\n",text);
76 76