Changeset 55

Timestamp:

Sep 26, 2024, 3:38:04 AM (11 months ago)

Author:

Alex Taylor

Message:

Slight code refactor and better validation handling in ULSQueryAttr.

Location:

rxuls/trunk

Files:

• Makefile (modified) (1 diff)
• rxuls.c (modified) (5 diffs)
• rxuls.def (modified) (1 diff)

rxuls/trunk/Makefile

@@ -20 +20 @@
 BL_DESC = "REXX Universal Language Support functions"
 BL_VENDOR = "Alex Taylor"
-BL_VERSION = "0.6.2"
+BL_VERSION = "0.6.3"
 
 

rxuls/trunk/rxuls.c

@@ -66 +66 @@
 
 #define SZ_LIBRARY_NAME         "RXULS"     // Name of this library
-//#define SZ_ERROR_NAME           "ULSERR"    // REXX variable used to store error codes
+//#define SZ_ERROR_NAME           "ULSERR"    // REXX variable used to store error codes - now defined in Makefile
 
 #define US_VERSION_MAJOR        0           // Major version number of this library
 #define US_VERSION_MINOR        6           // Minor version number of this library
-#define US_VERSION_REFRESH      2           // Refresh level of this library
+#define US_VERSION_REFRESH      3           // Refresh level of this library
 
 #define US_CPSPEC_MAXZ          72          // Maximum length of a conversion specifier
@@ -750 +750 @@
     AttrObject   attrib;                // attribute object
     LocaleObject locale;                // handle to the requested locale
-    UniChar      suChar[ 2 ],           // input UniChar (as string)
-                 *psuOffset,
+    UniChar      *psuChar,              // input character as Unicode
                  *psuAttrib;            // name of the requested attribute
-    PSZ          pszOffset;
     ULONG        ulSourceCP = 0,        // source codepage number
                  ulRC       = 0;        // return code
-    size_t       stInLen,
-                 stOutLen,
-                 stSubs;
 
 
@@ -790 +785 @@
                                   UCS_ENDIAN_SYSTEM, CONTROLS_MAP_DATA, DBCS_PATH_NO, 0 );
         if ( ulRC == ULS_SUCCESS ) {
-            memset( suChar, 0, sizeof(suChar) );
-            if ( ulSourceCP == 1200 ) {
-                // Input text is already UCS-2; parse it directly as such
-                suChar[ 0 ] = UNICHARFROM2BYTES( argv[0].strptr[0], argv[0].strptr[1] );
-            } else {
-                // Convert the input text to UCS-2
-                stInLen   = argv[0].strlength;
-                stOutLen  = 2;
-                stSubs    = 0;
-                pszOffset = argv[0].strptr;
-                psuOffset = suChar;
-                ulRC = UniUconvToUcs( uconvCP, (PPVOID) &pszOffset, &stInLen, &psuOffset, &stOutLen, &stSubs );
-                if ( ulRC != ULS_SUCCESS ) {
-                    WriteErrorCode( ulRC, "UniUconvToUcs");
-                    SaveResultString( prsResult, NULL, 0 );
-                }
-            }
-
-            if ( ulRC == ULS_SUCCESS ) {
+
+            // Convert the input character into Unicode if necessary
+            if ( InputStringToUnicode( argv[0], &psuChar, uconvCP, ulSourceCP )) {
+
                 // Convert the requested attribute name into UCS-2
                 psuAttrib = (UniChar *) calloc( argv[1].strlength + 1, sizeof(UniChar) );
@@ -818 +798 @@
 
                         // Now do the query and return the result
-                        if ( UniQueryCharAttr( attrib, suChar[0] ) == 0 ) {
+                        if ( UniQueryCharAttr( attrib, psuChar[0] ) == 0 ) {
                             SaveResultString( prsResult, PSZ_ZERO, 1 );
                         } else {
@@ -835 +815 @@
                 }
                 if ( psuAttrib ) free( psuAttrib );
+                free( psuChar );
             }
             UniFreeUconvObject( uconvCP );

rxuls/trunk/rxuls.def

@@ -1 +1 @@
 LIBRARY     RXULS INITINSTANCE TERMINSTANCE
 DATA        MULTIPLE NONSHARED
-DESCRIPTION '@#Alex Taylor:0.6.1#@##1## 4 Apr 2018 12:50:08      REINFORCE::::::@@REXX Universal Language Support functions'
+DESCRIPTION '@#Alex Taylor:0.6.3#@##1## 20 Sep 2024 08:48:06     VM-ArcaOS5::::::@@REXX Universal Language Support functions'
 
 EXPORTS     ULSLoadFuncs