Changeset 11 for trunk

Timestamp:

Oct 31, 2000, 8:43:30 PM (25 years ago)

Author:

umoeller

Message:

Updates for new xwphelpers plus others.

Location:

trunk/src/helpers

Files:

• textv_html.c (modified) (1 diff)
• tree.c (modified) (1 diff)
• winh.c (modified) (1 diff)
• xml.c (modified) (4 diffs)

trunk/src/helpers/textv_html.c

@@ -2028 +2028 @@
     BOOL    brc = TRUE;
 
-    PSZ     pszNew,
-            pTarget;
     ULONG   cbSource = strlen(*ppszText);
 

trunk/src/helpers/tree.c

@@ -473 +473 @@
         youngest->parent = descendent->parent;
     if (descendent->parent)
+    {
         if (descendent == descendent->parent->left)
             descendent->parent->left  = youngest;
         else
             descendent->parent->right = youngest;
+    }
     else
         *root = youngest;

trunk/src/helpers/winh.c

@@ -2463 +2463 @@
 
         case PROG_WINDOW_AUTO:
+#ifdef PROG_30_STD
         case PROG_30_STD:
+#endif
         case PROG_31_STD:
         case PROG_WINDOW_REAL:
+#ifdef PROG_30_STDSEAMLESSVDM
         case PROG_30_STDSEAMLESSVDM:
+#endif
         case PROG_31_STDSEAMLESSVDM:
         case PROG_30_STDSEAMLESSCOMMON:

trunk/src/helpers/xml.c

@@ -57 +57 @@
  */
 
+#define OS2EMX_PLAIN_CHAR
+    // this is needed for "os2emx.h"; if this is defined,
+    // emx will define PSZ as _signed_ char, otherwise
+    // as unsigned char
+
+#define INCL_DOSERRORS
+#include <os2.h>
+
 #include <stdlib.h>
 #include <string.h>
-
-#include <os2.h>
 
 #include "setup.h"                      // code generation and debugging options
@@ -547 +553 @@
                         PDOMNODE pParentNode,
                         PFNVALIDATE pfnValidateTag,
-                        const char **ppError);
+                        const char **ppError)
 {
     ULONG ulrc = 0;
@@ -726 +732 @@
                                                               pllSubList,
                                                               pNewNode,
-                                                              pfnValidateTag),
+                                                              pfnValidateTag,
+                                                              ppError);
 
                                             lstFree(pllSubList);
@@ -838 +845 @@
     ULONG   ulrc = 0;
 
-    const char *pSearchPos = pcszBuf;
-
     PLINKLIST pllTags = BuildTagsList(pcszBuf);
 
     // now create DOMNODE's according to that list...
+    const char *pcszError = 0;
     CreateNodesForBuf(pcszBuf,
                       NULL,     // enitre buffer
                       pllTags,
                       pParentNode,
-                      pfnValidateTag);
+                      pfnValidateTag,
+                      &pcszError);
 
     lstFree(pllTags);