Remove dashes in comments that don't need them, rewrap with pgindent.

Author: bmomjian

contrib/pg_dumplo/lo_export.c

@@ -1,7 +1,7 @@
 /* -------------------------------------------------------------------------
  * pg_dumplo
  *
- * $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/lo_export.c,v 1.6 2001/03/22 03:59:10 momjian Exp $
+ * $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/lo_export.c,v 1.7 2001/03/22 06:16:06 momjian Exp $
  *
  *					Karel Zak 1999-2000
  * -------------------------------------------------------------------------
@@ -32,15 +32,14 @@ load_lolist(LODumpMaster * pgLO)
 	int			i;
 	int			n;
 
-	/* ----------
+	/* 
 	 * Now find any candidate tables who have columns of type oid.
 	 *
 	 * NOTE: System tables including pg_largeobject will be ignored.
 	 * Otherwise we'd end up dumping all LOs, referenced or not.
 	 *
 	 * NOTE: the system oid column is ignored, as it has attnum < 1.
 	 * This shouldn't matter for correctness, but it saves time.
-	 * ----------
 	 */
 	pgLO->res = PQexec(pgLO->conn,
 					   "SELECT c.relname, a.attname "
@@ -109,9 +108,8 @@ pglo_export(LODumpMaster * pgLO)
 	for (ll = pgLO->lolist; ll->lo_table != NULL; ll++)
 	{
 
-		/* ----------
+		/* 
 		 * Query: find the LOs referenced by this column
-		 * ----------
 		 */
 		sprintf(Qbuff, "SELECT DISTINCT l.loid FROM \"%s\" x, pg_largeobject l WHERE x.\"%s\" = l.loid",
 				ll->lo_table, ll->lo_attr);
@@ -137,9 +135,8 @@ pglo_export(LODumpMaster * pgLO)
 			int			t;
 			char	   *val;
 
-			/* ----------
+			/*
 			 * Create DIR/FILE
-			 * ----------
 			 */
 			if (pgLO->action != ACTION_SHOW)
 			{

contrib/pg_dumplo/lo_import.c

@@ -1,7 +1,7 @@
 /* -------------------------------------------------------------------------
  * pg_dumplo
  *
- * $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/lo_import.c,v 1.4 2001/03/22 03:59:10 momjian Exp $
+ * $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/lo_import.c,v 1.5 2001/03/22 06:16:06 momjian Exp $
  *
  *					Karel Zak 1999-2000
  * -------------------------------------------------------------------------
@@ -50,9 +50,8 @@ pglo_import(LODumpMaster * pgLO)
 
 		sprintf(lo_path, "%s/%s", pgLO->space, path);
 
-		/* ----------
+		/* 
 		 * Import LO
-		 * ----------
 		 */
 		if ((new_oid = lo_import(pgLO->conn, lo_path)) == 0)
 		{
@@ -79,9 +78,8 @@ pglo_import(LODumpMaster * pgLO)
 
 		pgLO->counter++;
 
-		/* ----------
+		/* 
 		 * UPDATE oid in tab
-		 * ----------
 		 */
 		sprintf(Qbuff, "UPDATE \"%s\" SET \"%s\"=%u WHERE \"%s\"=%u",
 			loa.lo_table, loa.lo_attr, new_oid, loa.lo_attr, loa.lo_oid);

contrib/pg_dumplo/main.c

@@ -1,7 +1,7 @@
 /* -------------------------------------------------------------------------
  * pg_dumplo
  *
- * $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/main.c,v 1.7 2001/03/22 03:59:10 momjian Exp $
+ * $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/main.c,v 1.8 2001/03/22 06:16:06 momjian Exp $
  *
  *					Karel Zak 1999-2000
  * -------------------------------------------------------------------------
@@ -65,9 +65,8 @@ main(int argc, char **argv)
 
 	progname = argv[0];
 
-	/* ----------
+	/*
 	 * Parse ARGV
-	 * ----------
 	 */
 	if (argc > 1)
 	{
@@ -153,9 +152,8 @@ main(int argc, char **argv)
 		exit(RE_ERROR);
 	}
 
-	/* ----------
+	/* 
 	 * Check space
-	 * ----------
 	 */
 	if (!pgLO->space && !pgLO->action == ACTION_SHOW)
 	{
@@ -172,9 +170,8 @@ main(int argc, char **argv)
 		exit(RE_ERROR);
 	}
 
-	/* ----------
+	/* 
 	 * Make connection
-	 * ----------
 	 */
 	pgLO->conn = PQsetdbLogin(pgLO->host, NULL, NULL, NULL, pgLO->db,
 							  pgLO->user, pwd);
@@ -189,9 +186,8 @@ main(int argc, char **argv)
 	pgLO->user = PQuser(pgLO->conn);
 
 
-	/* ----------
+	/* 
 	 * Init index file
-	 * ----------
 	 */
 	if (pgLO->action != ACTION_SHOW)
 		index_file(pgLO);

src/backend/access/common/heaptuple.c

@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.70 2001/03/22 03:59:11 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.71 2001/03/22 06:16:06 momjian Exp $
  *
  * NOTES
  *	  The old interface functions have been converted to macros
@@ -246,9 +246,8 @@ nocachegetattr(HeapTuple tuple,
 		 * there's a null somewhere in the tuple
 		 */
 
-		/* ----------------
-		 *		check to see if desired att is null
-		 * ----------------
+		/*
+		 * check to see if desired att is null
 		 */
 
 #ifdef IN_MACRO
@@ -261,9 +260,8 @@ nocachegetattr(HeapTuple tuple,
 		}
 #endif
 
-		/* ----------------
-		 *		Now check to see if any preceding bits are null...
-		 * ----------------
+		/*
+		 * Now check to see if any preceding bits are null...
 		 */
 		{
 			int			byte = attnum >> 3;
@@ -658,9 +656,8 @@ heap_modifytuple(HeapTuple tuple,
 	HeapTuple	newTuple;
 	uint8		infomask;
 
-	/* ----------------
-	 *	sanity checks
-	 * ----------------
+	/*
+	 * sanity checks
 	 */
 	Assert(HeapTupleIsValid(tuple));
 	Assert(RelationIsValid(relation));
@@ -670,10 +667,9 @@ heap_modifytuple(HeapTuple tuple,
 
 	numberOfAttributes = RelationGetForm(relation)->relnatts;
 
-	/* ----------------
-	 *	allocate and fill *value and *nulls arrays from either
-	 *	the tuple or the repl information, as appropriate.
-	 * ----------------
+	/*
+	 * allocate and fill *value and *nulls arrays from either the tuple or
+	 * the repl information, as appropriate.
 	 */
 	value = (Datum *) palloc(numberOfAttributes * sizeof *value);
 	nulls = (char *) palloc(numberOfAttributes * sizeof *nulls);
@@ -701,17 +697,16 @@ heap_modifytuple(HeapTuple tuple,
 		}
 	}
 
-	/* ----------------
-	 *	create a new tuple from the *values and *nulls arrays
-	 * ----------------
+	/*
+	 * create a new tuple from the *values and *nulls arrays
 	 */
 	newTuple = heap_formtuple(RelationGetDescr(relation),
 							  value,
 							  nulls);
 
-	/* ----------------
-	 *	copy the header except for t_len, t_natts, t_hoff, t_bits, t_infomask
-	 * ----------------
+	/*
+	 * copy the header except for t_len, t_natts, t_hoff, t_bits,
+	 * t_infomask
 	 */
 	infomask = newTuple->t_data->t_infomask;
 	memmove((char *) &newTuple->t_data->t_oid,	/* XXX */

src/backend/access/common/indextuple.c

@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.53 2001/03/22 03:59:11 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.54 2001/03/22 06:16:06 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -165,9 +165,8 @@ index_formtuple(TupleDesc tupleDescriptor,
 
 	infomask |= size;
 
-	/* ----------------
+	/*
 	 * initialize metadata
-	 * ----------------
 	 */
 	tuple->t_info = infomask;
 	return tuple;
@@ -205,9 +204,9 @@ nocache_index_getattr(IndexTuple tup,
 	int			data_off;		/* tuple data offset */
 
 	(void) isnull;				/* not used */
-	/* ----------------
-	 *	sanity checks
-	 * ----------------
+
+	/*
+	 * sanity checks
 	 */
 
 	/* ----------------
@@ -246,9 +245,9 @@ nocache_index_getattr(IndexTuple tup,
 	}
 	else
 	{							/* there's a null somewhere in the tuple */
-		/* ----------------
-		 *		check to see if desired att is null
-		 * ----------------
+
+		/*
+		 * check to see if desired att is null
 		 */
 
 		/* XXX "knows" t_bits are just after fixed tuple header! */
@@ -264,9 +263,8 @@ nocache_index_getattr(IndexTuple tup,
 		}
 #endif
 
-		/* ----------------
-		 *		Now check to see if any preceding bits are null...
-		 * ----------------
+		/*
+		 * Now check to see if any preceding bits are null...
 		 */
 		{
 			int			byte = attnum >> 3;

src/backend/access/common/printtup.c

@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.58 2001/03/22 03:59:11 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.59 2001/03/22 06:16:06 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -155,16 +155,14 @@ printtup(HeapTuple tuple, TupleDesc typeinfo, DestReceiver *self)
 	if (myState->attrinfo != typeinfo || myState->nattrs != natts)
 		printtup_prepare_info(myState, typeinfo, natts);
 
-	/* ----------------
-	 *	tell the frontend to expect new tuple data (in ASCII style)
-	 * ----------------
+	/*
+	 * tell the frontend to expect new tuple data (in ASCII style)
 	 */
 	pq_beginmessage(&buf);
 	pq_sendbyte(&buf, 'D');
 
-	/* ----------------
-	 *	send a bitmap of which attributes are not null
-	 * ----------------
+	/*
+	 * send a bitmap of which attributes are not null
 	 */
 	j = 0;
 	k = 1 << 7;
@@ -183,9 +181,8 @@ printtup(HeapTuple tuple, TupleDesc typeinfo, DestReceiver *self)
 	if (k != (1 << 7))			/* flush last partial byte */
 		pq_sendint(&buf, j, 1);
 
-	/* ----------------
-	 *	send the attributes of this tuple
-	 * ----------------
+	/*
+	 * send the attributes of this tuple
 	 */
 	for (i = 0; i < natts; ++i)
 	{
@@ -357,16 +354,14 @@ printtup_internal(HeapTuple tuple, TupleDesc typeinfo, DestReceiver *self)
 	if (myState->attrinfo != typeinfo || myState->nattrs != natts)
 		printtup_prepare_info(myState, typeinfo, natts);
 
-	/* ----------------
-	 *	tell the frontend to expect new tuple data (in binary style)
-	 * ----------------
+	/*
+	 * tell the frontend to expect new tuple data (in binary style)
 	 */
 	pq_beginmessage(&buf);
 	pq_sendbyte(&buf, 'B');
 
-	/* ----------------
-	 *	send a bitmap of which attributes are not null
-	 * ----------------
+	/*
+	 * send a bitmap of which attributes are not null
 	 */
 	j = 0;
 	k = 1 << 7;
@@ -385,9 +380,8 @@ printtup_internal(HeapTuple tuple, TupleDesc typeinfo, DestReceiver *self)
 	if (k != (1 << 7))			/* flush last partial byte */
 		pq_sendint(&buf, j, 1);
 
-	/* ----------------
-	 *	send the attributes of this tuple
-	 * ----------------
+	/*
+	 * send the attributes of this tuple
 	 */
 #ifdef IPORTAL_DEBUG
 	fprintf(stderr, "sending tuple with %d atts\n", natts);