Move some system includes into c.h, and remove duplicates.

[postgresql] / src / backend / utils / adt / oracle_compat.c

diff --git a/src/backend/utils/adt/oracle_compat.c b/src/backend/utils/adt/oracle_compat.c
index fb8a512ed79329d8f96e34417a83e1fb7172f65a..50be811b22c8eabdd363c797cc50c98bf9756a19 100644 (file)
--- a/src/backend/utils/adt/oracle_compat.c
+++ b/src/backend/utils/adt/oracle_compat.c
@@ -1,7 +1,7 @@
 /*
  *     Edmund Mergl <E.Mergl@bawue.de>
  *
- *     $Id: oracle_compat.c,v 1.9 1997/09/08 02:30:57 momjian Exp $
+ *     $Id: oracle_compat.c,v 1.20 1999/07/15 15:20:19 momjian Exp $
  *
  */
 
@@ -9,17 +9,16 @@
 #include <ctype.h>
 #include "postgres.h"
 
-
-text      *lower(text * string);
-text      *upper(text * string);
-text      *initcap(text * string);
-text      *lpad(text * string1, int4 len, text * string2);
-text      *rpad(text * string1, int4 len, text * string2);
-text      *btrim(text * string, text * set);
-text      *ltrim(text * string, text * set);
-text      *rtrim(text * string, text * set);
-text      *substr(text * string, int4 m, int4 n);
-text      *translate(text * string, char from, char to);
+text      *lower(text *string);
+text      *upper(text *string);
+text      *initcap(text *string);
+text      *lpad(text *string1, int4 len, text *string2);
+text      *rpad(text *string1, int4 len, text *string2);
+text      *btrim(text *string, text *set);
+text      *ltrim(text *string, text *set);
+text      *rtrim(text *string, text *set);
+text      *substr(text *string, int4 m, int4 n);
+text      *translate(text *string, char from, char to);
 
 
 /********************************************************************
@@ -36,8 +35,8 @@ text     *translate(text * string, char from, char to);
  *
  ********************************************************************/
 
-text      *
-lower(text * string)
+text *
+lower(text *string)
 {
        text       *ret;
        char       *ptr,
@@ -54,9 +53,7 @@ lower(text * string)
        ptr_ret = VARDATA(ret);
 
        while (m--)
-       {
-               *ptr_ret++ = tolower(*ptr++);
-       }
+               *ptr_ret++ = tolower((unsigned char) *ptr++);
 
        return ret;
 }
@@ -76,8 +73,8 @@ lower(text * string)
  *
  ********************************************************************/
 
-text      *
-upper(text * string)
+text *
+upper(text *string)
 {
        text       *ret;
        char       *ptr,
@@ -94,9 +91,7 @@ upper(text * string)
        ptr_ret = VARDATA(ret);
 
        while (m--)
-       {
-               *ptr_ret++ = toupper(*ptr++);
-       }
+               *ptr_ret++ = toupper((unsigned char) *ptr++);
 
        return ret;
 }
@@ -118,8 +113,8 @@ upper(text * string)
  *
  ********************************************************************/
 
-text      *
-initcap(text * string)
+text *
+initcap(text *string)
 {
        text       *ret;
        char       *ptr,
@@ -135,19 +130,15 @@ initcap(text * string)
        ptr = VARDATA(string);
        ptr_ret = VARDATA(ret);
 
-       *ptr_ret++ = toupper(*ptr++);
+       *ptr_ret++ = toupper((unsigned char) *ptr++);
        --m;
 
        while (m--)
        {
                if (*(ptr_ret - 1) == ' ' || *(ptr_ret - 1) == '        ')
-               {
-                       *ptr_ret++ = toupper(*ptr++);
-               }
+                       *ptr_ret++ = toupper((unsigned char) *ptr++);
                else
-               {
-                       *ptr_ret++ = tolower(*ptr++);
-               }
+                       *ptr_ret++ = tolower((unsigned char) *ptr++);
        }
 
        return ret;
@@ -169,8 +160,8 @@ initcap(text * string)
  *
  ********************************************************************/
 
-text      *
-lpad(text * string1, int4 len, text * string2)
+text *
+lpad(text *string1, int4 len, text *string2)
 {
        text       *ret;
        char       *ptr1,
@@ -202,9 +193,7 @@ lpad(text * string1, int4 len, text * string2)
        ptr1 = VARDATA(string1);
 
        while (n--)
-       {
                *ptr_ret++ = *ptr1++;
-       }
 
        return ret;
 }
@@ -225,8 +214,8 @@ lpad(text * string1, int4 len, text * string2)
  *
  ********************************************************************/
 
-text      *
-rpad(text * string1, int4 len, text * string2)
+text *
+rpad(text *string1, int4 len, text *string2)
 {
        text       *ret;
        char       *ptr1,
@@ -250,9 +239,7 @@ rpad(text * string1, int4 len, text * string2)
        ptr_ret = VARDATA(ret);
 
        while (n--)
-       {
                *ptr_ret++ = *ptr1++;
-       }
 
        ptr2 = VARDATA(string2);
 
@@ -281,8 +268,8 @@ rpad(text * string1, int4 len, text * string2)
  *
  ********************************************************************/
 
-text      *
-btrim(text * string, text * set)
+text *
+btrim(text *string, text *set)
 {
        text       *ret;
        char       *ptr,
@@ -306,15 +293,11 @@ btrim(text * string, text * set)
                while (ptr2 <= end2)
                {
                        if (*ptr == *ptr2)
-                       {
                                break;
-                       }
                        ++ptr2;
                }
-               if (*ptr != *ptr2)
-               {
+               if (ptr2 > end2)
                        break;
-               }
                ptr++;
                ptr2 = VARDATA(set);
        }
@@ -329,15 +312,11 @@ btrim(text * string, text * set)
                while (ptr2 <= end2)
                {
                        if (*end == *ptr2)
-                       {
                                break;
-                       }
                        ++ptr2;
                }
-               if (*end != *ptr2)
-               {
+               if (ptr2 > end2)
                        break;
-               }
                --end;
                ptr2 = VARDATA(set);
        }
@@ -349,7 +328,7 @@ btrim(text * string, text * set)
        memcpy(VARDATA(ret), ptr, m);
 
        return ret;
-}                                                              /* btrim() */
+}      /* btrim() */
 
 
 /********************************************************************
@@ -367,8 +346,8 @@ btrim(text * string, text * set)
  *
  ********************************************************************/
 
-text      *
-ltrim(text * string, text * set)
+text *
+ltrim(text *string, text *set)
 {
        text       *ret;
        char       *ptr,
@@ -391,15 +370,11 @@ ltrim(text * string, text * set)
                while (ptr2 <= end2)
                {
                        if (*ptr == *ptr2)
-                       {
                                break;
-                       }
                        ++ptr2;
                }
-               if (*ptr != *ptr2)
-               {
+               if (ptr2 > end2)
                        break;
-               }
                ptr++;
                ptr2 = VARDATA(set);
        }
@@ -430,8 +405,8 @@ ltrim(text * string, text * set)
  *
  ********************************************************************/
 
-text      *
-rtrim(text * string, text * set)
+text *
+rtrim(text *string, text *set)
 {
        text       *ret;
        char       *ptr,
@@ -455,15 +430,11 @@ rtrim(text * string, text * set)
                while (ptr2 <= end2)
                {
                        if (*ptr == *ptr2)
-                       {
                                break;
-                       }
                        ++ptr2;
                }
-               if (*ptr != *ptr2)
-               {
+               if (ptr2 > end2)
                        break;
-               }
                --ptr;
                ptr2 = VARDATA(set);
        }
@@ -472,16 +443,14 @@ rtrim(text * string, text * set)
 
        ret = (text *) palloc(VARHDRSZ + m);
        VARSIZE(ret) = VARHDRSZ + m;
-#if FALSE
+#ifdef NOT_USED
        memcpy(VARDATA(ret), ptr - VARSIZE(ret) + m, m);
 #endif
 
        ptr_ret = VARDATA(ret) + m - 1;
 
        while (m--)
-       {
                *ptr_ret-- = *ptr--;
-       }
 
        return ret;
 }
@@ -502,8 +471,9 @@ rtrim(text * string, text * set)
  *
  ********************************************************************/
 
-text      *
-substr(text * string, int4 m, int4 n)
+#ifdef NOT_USED
+text *
+substr(text *string, int4 m, int4 n)
 {
        text       *ret;
        char       *ptr,
@@ -512,7 +482,7 @@ substr(text * string, int4 m, int4 n)
 
        if ((string == (text *) NULL) ||
                (m <= 0) || (n <= 0) ||
-               ((len = VARSIZE(string) - VARHDRSZ - m) <= 0))
+               ((len = VARSIZE(string) - VARHDRSZ - m + 1) <= 0))
                return string;
 
        len = len + 1 < n ? len + 1 : n;
@@ -524,13 +494,11 @@ substr(text * string, int4 m, int4 n)
        ptr_ret = VARDATA(ret);
 
        while (len--)
-       {
                *ptr_ret++ = *ptr++;
-       }
 
        return ret;
 }
-
+#endif
 
 /********************************************************************
  *
@@ -548,8 +516,8 @@ substr(text * string, int4 m, int4 n)
  *
  ********************************************************************/
 
-text      *
-translate(text * string, char from, char to)
+text *
+translate(text *string, char from, char to)
 {
        text       *ret;
        char       *ptr,