Commit 0ef4476bc757de70cc097865159913a4fd3b755b

Authored by perry.werneck@gmail.com
1 parent 545cfc6f

Implementando módulo rexx

src/include/lib3270/config.h.in
@@ -38,12 +38,14 @@ @@ -38,12 +38,14 @@
38 #undef PACKAGE_REVISION 38 #undef PACKAGE_REVISION
39 39
40 #undef HAVE_GNUC_VISIBILITY 40 #undef HAVE_GNUC_VISIBILITY
41 - #undef HAVE_ICONV  
42 #undef HAVE_LIBM 41 #undef HAVE_LIBM
43 #undef HAVE_LIBINTL 42 #undef HAVE_LIBINTL
44 #undef HAVE_GETADDRINFO 43 #undef HAVE_GETADDRINFO
45 #undef HAVE_SYSLOG 44 #undef HAVE_SYSLOG
46 45
  46 + #undef HAVE_ICONV
  47 + #undef ICONV_CONST
  48 +
47 #ifdef WIN32 49 #ifdef WIN32
48 #undef HAVE_WIN_REGISTRY 50 #undef HAVE_WIN_REGISTRY
49 #endif // HAVE_WIN_REGISTRY 51 #endif // HAVE_WIN_REGISTRY
src/plugins/rx3270/rexx_methods.cc
@@ -205,7 +205,7 @@ RexxMethod2(int, rx3270_method_screen_trace, CSELF, sessionPtr, int, flag) @@ -205,7 +205,7 @@ RexxMethod2(int, rx3270_method_screen_trace, CSELF, sessionPtr, int, flag)
205 205
206 } 206 }
207 207
208 -RexxMethod2(int, rx3270_method_data_trace, CSELF, sessionPtr, int, flag) 208 +RexxMethod2(int, rx3270_method_ds_trace, CSELF, sessionPtr, int, flag)
209 { 209 {
210 rx3270 *hSession = (rx3270 *) sessionPtr; 210 rx3270 *hSession = (rx3270 *) sessionPtr;
211 if(!hSession) 211 if(!hSession)
@@ -214,7 +214,7 @@ RexxMethod2(int, rx3270_method_data_trace, CSELF, sessionPtr, int, flag) @@ -214,7 +214,7 @@ RexxMethod2(int, rx3270_method_data_trace, CSELF, sessionPtr, int, flag)
214 return 0; 214 return 0;
215 } 215 }
216 216
217 -RexxMethod3(int, rx3270_method_set_toggle, CSELF, sessionPtr, CSTRING, name, int, flag) 217 +RexxMethod3(int, rx3270_method_set_option, CSELF, sessionPtr, CSTRING, name, int, flag)
218 { 218 {
219 static const struct _toggle_info 219 static const struct _toggle_info
220 { 220 {
src/plugins/rx3270/rx3270.cls
@@ -51,9 +51,9 @@ @@ -51,9 +51,9 @@
51 51
52 ::METHOD ENTER EXTERNAL "LIBRARY rx3270 rx3270_method_enter" 52 ::METHOD ENTER EXTERNAL "LIBRARY rx3270 rx3270_method_enter"
53 ::METHOD PFKEY EXTERNAL "LIBRARY rx3270 rx3270_method_pfkey" 53 ::METHOD PFKEY EXTERNAL "LIBRARY rx3270 rx3270_method_pfkey"
54 -::METHOD PFKEY EXTERNAL "LIBRARY rx3270 rx3270_method_pakey" 54 +::METHOD PAKEY EXTERNAL "LIBRARY rx3270 rx3270_method_pakey"
55 55
56 -::METHOD OPTION EXTERNAL "LIBRARY rx3270 rx3270_method_set_toggle" 56 +::METHOD OPTION EXTERNAL "LIBRARY rx3270 rx3270_method_set_option"
57 ::METHOD EVENTTRACE EXTERNAL "LIBRARY rx3270 rx3270_method_event_trace" 57 ::METHOD EVENTTRACE EXTERNAL "LIBRARY rx3270 rx3270_method_event_trace"
58 ::METHOD SCREENTRACE EXTERNAL "LIBRARY rx3270 rx3270_method_screen_trace" 58 ::METHOD SCREENTRACE EXTERNAL "LIBRARY rx3270 rx3270_method_screen_trace"
59 ::METHOD DSTRACE EXTERNAL "LIBRARY rx3270 rx3270_method_ds_trace" 59 ::METHOD DSTRACE EXTERNAL "LIBRARY rx3270 rx3270_method_ds_trace"
src/plugins/rx3270/rx3270.h
@@ -91,8 +91,8 @@ @@ -91,8 +91,8 @@
91 REXX_METHOD_PROTOTYPE(rx3270_method_cmp_text_at); 91 REXX_METHOD_PROTOTYPE(rx3270_method_cmp_text_at);
92 REXX_METHOD_PROTOTYPE(rx3270_method_event_trace); 92 REXX_METHOD_PROTOTYPE(rx3270_method_event_trace);
93 REXX_METHOD_PROTOTYPE(rx3270_method_screen_trace); 93 REXX_METHOD_PROTOTYPE(rx3270_method_screen_trace);
94 - REXX_METHOD_PROTOTYPE(rx3270_method_data_trace);  
95 - REXX_METHOD_PROTOTYPE(rx3270_method_set_toggle); 94 + REXX_METHOD_PROTOTYPE(rx3270_method_ds_trace);
  95 + REXX_METHOD_PROTOTYPE(rx3270_method_set_option);
96 96
97 /*---[ Globals ]---------------------------------------------------------------------------------------------*/ 97 /*---[ Globals ]---------------------------------------------------------------------------------------------*/
98 98
src/plugins/rx3270/rxapimain.cc
@@ -128,8 +128,8 @@ RexxMethodEntry rx3270_methods[] = @@ -128,8 +128,8 @@ RexxMethodEntry rx3270_methods[] =
128 REXX_METHOD(rx3270_method_cmp_text_at, rx3270_method_cmp_text_at ), 128 REXX_METHOD(rx3270_method_cmp_text_at, rx3270_method_cmp_text_at ),
129 REXX_METHOD(rx3270_method_event_trace, rx3270_method_event_trace ), 129 REXX_METHOD(rx3270_method_event_trace, rx3270_method_event_trace ),
130 REXX_METHOD(rx3270_method_screen_trace, rx3270_method_screen_trace ), 130 REXX_METHOD(rx3270_method_screen_trace, rx3270_method_screen_trace ),
131 - REXX_METHOD(rx3270_method_data_trace, rx3270_method_data_trace ),  
132 - REXX_METHOD(rx3270_method_set_toggle, rx3270_method_set_toggle ), 131 + REXX_METHOD(rx3270_method_ds_trace, rx3270_method_ds_trace ),
  132 + REXX_METHOD(rx3270_method_set_option, rx3270_method_set_option ),
133 133
134 REXX_LAST_METHOD() 134 REXX_LAST_METHOD()
135 }; 135 };
src/plugins/rx3270/text.cc
@@ -49,7 +49,7 @@ char * rx3270::get_3270_string(const char *str) @@ -49,7 +49,7 @@ char * rx3270::get_3270_string(const char *str)
49 49
50 iconv(conv2Host,NULL,NULL,NULL,NULL); // Reset state 50 iconv(conv2Host,NULL,NULL,NULL,NULL); // Reset state
51 51
52 - if(iconv(conv2Host,&str,&in,&ptr,&out) == ((size_t) -1)) 52 + if(iconv(conv2Host,(ICONV_CONST char **) &str,&in,&ptr,&out) == ((size_t) -1))
53 ret = strdup((char *) str); 53 ret = strdup((char *) str);
54 else 54 else
55 ret = strdup(buffer); 55 ret = strdup(buffer);
@@ -78,7 +78,7 @@ char * rx3270::get_local_string(const char *str) @@ -78,7 +78,7 @@ char * rx3270::get_local_string(const char *str)
78 78
79 iconv(conv2Local,NULL,NULL,NULL,NULL); // Reset state 79 iconv(conv2Local,NULL,NULL,NULL,NULL); // Reset state
80 80
81 - if(iconv(conv2Local,&str,&in,&ptr,&out) == ((size_t) -1)) 81 + if(iconv(conv2Local,(ICONV_CONST char **) &str,&in,&ptr,&out) == ((size_t) -1))
82 ret = strdup((char *) str); 82 ret = strdup((char *) str);
83 else 83 else
84 ret = strdup(buffer); 84 ret = strdup(buffer);