Changeset 23 for trunk/include/helpers/xstring.h

Timestamp:

Jan 16, 2001, 8:49:10 PM (25 years ago)

Author:

umoeller

Message:

Fixes for V0.9.7.

File:

• trunk/include/helpers/xstring.h (modified) (4 diffs)

trunk/include/helpers/xstring.h

@@ -82 +82 @@
     typedef XSTRSET *PXSTRSET;
 
-    ULONG XWPENTRY xstrcpy(PXSTRING pxstr, const char *pcszSource);
-    typedef ULONG XWPENTRY XSTRCPY(PXSTRING pxstr, const char *pcszSource);
+    ULONG XWPENTRY xstrcpy(PXSTRING pxstr, const char *pcszSource, ULONG ulSourceLength);
+    typedef ULONG XWPENTRY XSTRCPY(PXSTRING pxstr, const char *pcszSource, ULONG ulSourceLength);
     typedef XSTRCPY *PXSTRCPY;
 
-    ULONG XWPENTRY xstrcat(PXSTRING pxstr, const char *pcszSource);
-    typedef ULONG XWPENTRY XSTRCAT(PXSTRING pxstr, const char *pcszSource);
+    ULONG XWPENTRY xstrcat(PXSTRING pxstr, const char *pcszSource, ULONG ulSourceLength);
+    typedef ULONG XWPENTRY XSTRCAT(PXSTRING pxstr, const char *pcszSource, ULONG ulSourceLength);
     typedef XSTRCAT *PXSTRCAT;
 
@@ -102 +102 @@
 
     #define xstrIsString(psz) ( (psz != 0) && (*(psz) != 0) )
+
+    ULONG XWPENTRY xstrrpl(PXSTRING pxstr,
+                           ULONG ulFirstReplOfs,
+                           ULONG cReplLen,
+                           const XSTRING *pstrReplaceWith);
+    typedef ULONG XWPENTRY XSTRRPL(PXSTRING pxstr,
+                                   ULONG ulFirstReplOfs,
+                                   ULONG cReplLen,
+                                   const XSTRING *pstrReplaceWith);
+    typedef XSTRRPL *PXSTRRPL;
 
     PSZ XWPENTRY xstrFindWord(const XSTRING *pxstr,
@@ -119 +129 @@
     typedef XSTRFINDWORD *PXSTRFINDWORD;
 
-    ULONG XWPENTRY xstrrpl(PXSTRING pxstr,
-                           PULONG pulOfs,
-                           const XSTRING *pstrSearch,
-                           const XSTRING *pstrReplace,
-                           size_t *pShiftTable,
-                           PBOOL pfRepeatFind);
-    typedef ULONG XWPENTRY XSTRRPL(PXSTRING pxstr,
+    ULONG XWPENTRY xstrFindReplace(PXSTRING pxstr,
                                    PULONG pulOfs,
                                    const XSTRING *pstrSearch,
@@ -131 +135 @@
                                    size_t *pShiftTable,
                                    PBOOL pfRepeatFind);
-    typedef XSTRRPL *PXSTRRPL;
+    typedef ULONG XWPENTRY XSTRFINDREPLACE(PXSTRING pxstr,
+                                           PULONG pulOfs,
+                                           const XSTRING *pstrSearch,
+                                           const XSTRING *pstrReplace,
+                                           size_t *pShiftTable,
+                                           PBOOL pfRepeatFind);
+    typedef XSTRFINDREPLACE *PXSTRFINDREPLACE;
 
-    ULONG XWPENTRY xstrcrpl(PXSTRING pxstr,
-                            PULONG pulOfs,
-                            const char *pcszSearch,
-                            const char *pcszReplace);
-    typedef ULONG XWPENTRY XSTRCRPL(PXSTRING pxstr,
+    ULONG XWPENTRY xstrFindReplaceC(PXSTRING pxstr,
                                     PULONG pulOfs,
                                     const char *pcszSearch,
                                     const char *pcszReplace);
-    typedef XSTRCRPL *PXSTRCRPL;
+    typedef ULONG XWPENTRY XSTRFINDREPLACEC(PXSTRING pxstr,
+                                            PULONG pulOfs,
+                                            const char *pcszSearch,
+                                            const char *pcszReplace);
+    typedef XSTRFINDREPLACEC *PXSTRFINDREPLACEC;
+
+    VOID XWPENTRY xstrConvertLineFormat(PXSTRING pxstr, BOOL fToCFormat);
+    typedef VOID XWPENTRY XSTRCONVERTLINEFORMAT(PXSTRING pxstr, BOOL fToCFormat);
+    typedef XSTRCONVERTLINEFORMAT *PXSTRCONVERTLINEFORMAT;
+
 #endif