Update copyright for 2006. Update scripts.

[postgresql] / src / tutorial / funcs.c

diff --git a/src/tutorial/funcs.c b/src/tutorial/funcs.c
index 621503a421c785a246ccb3569b7fd7b88b873fcc..a988ad431b2d2c8457380d6cdf3688a920cef6e2 100644 (file)
--- a/src/tutorial/funcs.c
+++ b/src/tutorial/funcs.c
@@ -9,8 +9,6 @@
   See funcs_new.c for examples of "new style".
 *****************************************************************************/
 
-#include <string.h>
-
 #include "postgres.h"                  /* general Postgres declarations */
 
 #include "executor/executor.h" /* for GetAttributeByName() */
@@ -20,20 +18,20 @@
 /* These prototypes just prevent possible warnings from gcc. */
 
 int                    add_one(int arg);
-float8     *add_one_float8(float8 *arg);
+float8    *add_one_float8(float8 *arg);
 Point     *makepoint(Point *pointx, Point *pointy);
 text      *copytext(text *t);
-text       *concat_text(text *arg1, text *arg2);
-bool c_overpaid(TupleTableSlot *t,     /* the current instance of EMP */
+text      *concat_text(text *arg1, text *arg2);
+bool c_overpaid(HeapTupleHeader t,     /* the current instance of EMP */
                   int32 limit);
 
 
 /* By Value */
-         
+
 int
 add_one(int arg)
 {
-    return arg + 1;
+       return arg + 1;
 }
 
 /* By Reference, Fixed Length */
@@ -41,22 +39,22 @@ add_one(int arg)
 float8 *
 add_one_float8(float8 *arg)
 {
-    float8    *result = (float8 *) palloc(sizeof(float8));
+       float8     *result = (float8 *) palloc(sizeof(float8));
 
-    *result = *arg + 1.0;
-       
-    return result;
+       *result = *arg + 1.0;
+
+       return result;
 }
 
 Point *
 makepoint(Point *pointx, Point *pointy)
 {
-    Point     *new_point = (Point *) palloc(sizeof(Point));
+       Point      *new_point = (Point *) palloc(sizeof(Point));
+
+       new_point->x = pointx->x;
+       new_point->y = pointy->y;
 
-    new_point->x = pointx->x;
-    new_point->y = pointy->y;
-       
-    return new_point;
+       return new_point;
 }
 
 /* By Reference, Variable Length */
@@ -64,44 +62,46 @@ makepoint(Point *pointx, Point *pointy)
 text *
 copytext(text *t)
 {
-    /*
-     * VARSIZE is the total size of the struct in bytes.
-     */
-    text *new_t = (text *) palloc(VARSIZE(t));
-    VARATT_SIZEP(new_t) = VARSIZE(t);
-    /*
-     * VARDATA is a pointer to the data region of the struct.
-     */
-    memcpy((void *) VARDATA(new_t), /* destination */
-           (void *) VARDATA(t),     /* source */
-           VARSIZE(t)-VARHDRSZ);    /* how many bytes */
-    return new_t;
+       /*
+        * VARSIZE is the total size of the struct in bytes.
+        */
+       text       *new_t = (text *) palloc(VARSIZE(t));
+
+       VARATT_SIZEP(new_t) = VARSIZE(t);
+
+       /*
+        * VARDATA is a pointer to the data region of the struct.
+        */
+       memcpy((void *) VARDATA(new_t),         /* destination */
+                  (void *) VARDATA(t), /* source */
+                  VARSIZE(t) - VARHDRSZ);              /* how many bytes */
+       return new_t;
 }
 
 text *
 concat_text(text *arg1, text *arg2)
 {
-    int32 new_text_size = VARSIZE(arg1) + VARSIZE(arg2) - VARHDRSZ;
-    text *new_text = (text *) palloc(new_text_size);
-
-    memset((void *) new_text, 0, new_text_size);
-    VARATT_SIZEP(new_text) = new_text_size;
-    strncpy(VARDATA(new_text), VARDATA(arg1), VARSIZE(arg1)-VARHDRSZ);
-    strncat(VARDATA(new_text), VARDATA(arg2), VARSIZE(arg2)-VARHDRSZ);
-    return new_text;
+       int32           new_text_size = VARSIZE(arg1) + VARSIZE(arg2) - VARHDRSZ;
+       text       *new_text = (text *) palloc(new_text_size);
+
+       memset((void *) new_text, 0, new_text_size);
+       VARATT_SIZEP(new_text) = new_text_size;
+       strncpy(VARDATA(new_text), VARDATA(arg1), VARSIZE(arg1) - VARHDRSZ);
+       strncat(VARDATA(new_text), VARDATA(arg2), VARSIZE(arg2) - VARHDRSZ);
+       return new_text;
 }
 
 /* Composite types */
 
 bool
-c_overpaid(TupleTableSlot *t,  /* the current instance of EMP */
+c_overpaid(HeapTupleHeader t,  /* the current instance of EMP */
                   int32 limit)
 {
-    bool isnull;
-    int32 salary;
+       bool            isnull;
+       int32           salary;
 
-    salary = DatumGetInt32(GetAttributeByName(t, "salary", &isnull));
-    if (isnull)
-        return (false);
-    return salary > limit;
+       salary = DatumGetInt32(GetAttributeByName(t, "salary", &isnull));
+       if (isnull)
+               return false;
+       return salary > limit;
 }