Add copyright, clean up code a bit.

1999-03-17  Jeff Garzik  <jgarzik@pobox.com>

        * gstack.c, gqueue.c:
        Add copyright, clean up code a bit.

diff --git a/ChangeLog b/ChangeLog
index bc5054211a589a202d492560b6d38379765c23a2..21281784863763b14cf2d353f995d07a8bde8528 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-03-17  Jeff Garzik  <jgarzik@pobox.com>
+
+       * gstack.c, gqueue.c:
+       Add copyright, clean up code a bit.
+
 1999-03-17  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: Added missing values for G_MAXU(SHORT|INT|LONG) on

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index bc5054211a589a202d492560b6d38379765c23a2..21281784863763b14cf2d353f995d07a8bde8528 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+1999-03-17  Jeff Garzik  <jgarzik@pobox.com>
+
+       * gstack.c, gqueue.c:
+       Add copyright, clean up code a bit.
+
 1999-03-17  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: Added missing values for G_MAXU(SHORT|INT|LONG) on

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index bc5054211a589a202d492560b6d38379765c23a2..21281784863763b14cf2d353f995d07a8bde8528 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+1999-03-17  Jeff Garzik  <jgarzik@pobox.com>
+
+       * gstack.c, gqueue.c:
+       Add copyright, clean up code a bit.
+
 1999-03-17  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: Added missing values for G_MAXU(SHORT|INT|LONG) on

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index bc5054211a589a202d492560b6d38379765c23a2..21281784863763b14cf2d353f995d07a8bde8528 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+1999-03-17  Jeff Garzik  <jgarzik@pobox.com>
+
+       * gstack.c, gqueue.c:
+       Add copyright, clean up code a bit.
+
 1999-03-17  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: Added missing values for G_MAXU(SHORT|INT|LONG) on

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index bc5054211a589a202d492560b6d38379765c23a2..21281784863763b14cf2d353f995d07a8bde8528 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+1999-03-17  Jeff Garzik  <jgarzik@pobox.com>
+
+       * gstack.c, gqueue.c:
+       Add copyright, clean up code a bit.
+
 1999-03-17  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: Added missing values for G_MAXU(SHORT|INT|LONG) on

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index bc5054211a589a202d492560b6d38379765c23a2..21281784863763b14cf2d353f995d07a8bde8528 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+1999-03-17  Jeff Garzik  <jgarzik@pobox.com>
+
+       * gstack.c, gqueue.c:
+       Add copyright, clean up code a bit.
+
 1999-03-17  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: Added missing values for G_MAXU(SHORT|INT|LONG) on

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index bc5054211a589a202d492560b6d38379765c23a2..21281784863763b14cf2d353f995d07a8bde8528 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+1999-03-17  Jeff Garzik  <jgarzik@pobox.com>
+
+       * gstack.c, gqueue.c:
+       Add copyright, clean up code a bit.
+
 1999-03-17  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: Added missing values for G_MAXU(SHORT|INT|LONG) on

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index bc5054211a589a202d492560b6d38379765c23a2..21281784863763b14cf2d353f995d07a8bde8528 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+1999-03-17  Jeff Garzik  <jgarzik@pobox.com>
+
+       * gstack.c, gqueue.c:
+       Add copyright, clean up code a bit.
+
 1999-03-17  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: Added missing values for G_MAXU(SHORT|INT|LONG) on

diff --git a/glib/gqueue.c b/glib/gqueue.c
index 85e9b54b76ca038b74bcd3ee09c83b8540b0c35e..b516b2474e64d3b20b2e63b22b98484444efd7c1 100644 (file)
--- a/glib/gqueue.c
+++ b/glib/gqueue.c
@@ -1,20 +1,21 @@
-/*
-* GQueue, opaque ADT with interface:
-
-       q = g_queue_new ();
-       count = g_queue_size (q);
-
-       q_queue_push_front (q, data);
-       q_queue_push_back (q, data);
-       data = q_queue_pop_front (q);
-       data = q_queue_pop_back (q);
-       #define q_queue_push q_queue_push_back
-       #define q_queue_pop q_queue_pop_front
-
-       list = g_queue_get_list (q);
-       #define g_queue_get_front g_queue_get_list
-       list_end = g_queue_get_back (q);
-*/
+/* GLIB - Library of useful routines for C programming
+ * Copyright (C) 1999 Free Software Foundation, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
 
 
 #ifdef HAVE_CONFIG_H
@@ -41,11 +42,12 @@ g_queue_new (void)
 void
 g_queue_free (GQueue *q)
 {
-  if (q) {
-    if (q->list)
-      g_list_free (q->list);
-    g_free (q);
-  }
+  if (q)
+    {
+      if (q->list)
+        g_list_free (q->list);
+      g_free (q);
+    }
 }
 
 
@@ -59,30 +61,32 @@ g_queue_get_size (GQueue *q)
 void
 g_queue_push_front (GQueue *q, gpointer data)
 {
-  if (q) {
-    q->list = g_list_prepend (q->list, data);
+  if (q)
+    {
+      q->list = g_list_prepend (q->list, data);
 
-    if (q->list_end == NULL)
-      q->list_end = q->list;
+      if (q->list_end == NULL)
+        q->list_end = q->list;
 
-    q->list_size++;
-  }
+      q->list_size++;
+    }
 }
 
 
 void
 g_queue_push_back (GQueue *q, gpointer data)
 {
-  if (q) {
-    q->list_end = g_list_append (q->list_end, data);
+  if (q)
+    {
+      q->list_end = g_list_append (q->list_end, data);
 
-    if (! q->list)
-      q->list = q->list_end;
-    else
-      q->list_end = q->list_end->next;
+      if (! q->list)
+        q->list = q->list_end;
+      else
+        q->list_end = q->list_end->next;
 
-    q->list_size++;
-  }
+      q->list_size++;
+    }
 }
 
 
@@ -91,25 +95,28 @@ g_queue_pop_front (GQueue *q)
 {
   gpointer data = NULL;
 
-  if ((q) && (q->list)) {
-    GList *node;
-
-    node = q->list;
-    data = node->data;
-
-    if (! node->next) {
-      q->list = q->list_end = NULL;
-      q->list_size = 0;
-    }
-    else {
-      q->list = node->next;
-      q->list->prev = NULL;
-      q->list_size--;
+  if ((q) && (q->list))
+    {
+      GList *node;
+
+      node = q->list;
+      data = node->data;
+
+      if (! node->next)
+        {
+          q->list = q->list_end = NULL;
+          q->list_size = 0;
+        }
+      else
+        {
+          q->list = node->next;
+          q->list->prev = NULL;
+          q->list_size--;
+        }
+
+      g_list_free_1 (node);
     }
 
-    g_list_free_1 (node);
-  }
-
   return data;
 }
 
@@ -119,25 +126,28 @@ g_queue_pop_back (GQueue *q)
 {
   gpointer data = NULL;
 
-  if ((q) && (q->list)) {
-    GList *node;
-
-    node = q->list_end;
-    data = node->data;
-
-    if (! node->prev) {
-      q->list = q->list_end = NULL;
-      q->list_size = 0;
-    }
-    else {
-      q->list_end = node->prev;
-      q->list_end->next = NULL;
-      q->list_size--;
+  if ((q) && (q->list))
+    {
+      GList *node;
+
+      node = q->list_end;
+      data = node->data;
+
+      if (! node->prev)
+       {
+          q->list = q->list_end = NULL;
+          q->list_size = 0;
+        }
+      else
+       {
+          q->list_end = node->prev;
+          q->list_end->next = NULL;
+          q->list_size--;
+        }
+
+      g_list_free_1 (node);
     }
 
-    g_list_free_1 (node);
-  }
-
   return data;
 }
 

diff --git a/gqueue.c b/gqueue.c
index 85e9b54b76ca038b74bcd3ee09c83b8540b0c35e..b516b2474e64d3b20b2e63b22b98484444efd7c1 100644 (file)
--- a/gqueue.c
+++ b/gqueue.c
@@ -1,20 +1,21 @@
-/*
-* GQueue, opaque ADT with interface:
-
-       q = g_queue_new ();
-       count = g_queue_size (q);
-
-       q_queue_push_front (q, data);
-       q_queue_push_back (q, data);
-       data = q_queue_pop_front (q);
-       data = q_queue_pop_back (q);
-       #define q_queue_push q_queue_push_back
-       #define q_queue_pop q_queue_pop_front
-
-       list = g_queue_get_list (q);
-       #define g_queue_get_front g_queue_get_list
-       list_end = g_queue_get_back (q);
-*/
+/* GLIB - Library of useful routines for C programming
+ * Copyright (C) 1999 Free Software Foundation, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
 
 
 #ifdef HAVE_CONFIG_H
@@ -41,11 +42,12 @@ g_queue_new (void)
 void
 g_queue_free (GQueue *q)
 {
-  if (q) {
-    if (q->list)
-      g_list_free (q->list);
-    g_free (q);
-  }
+  if (q)
+    {
+      if (q->list)
+        g_list_free (q->list);
+      g_free (q);
+    }
 }
 
 
@@ -59,30 +61,32 @@ g_queue_get_size (GQueue *q)
 void
 g_queue_push_front (GQueue *q, gpointer data)
 {
-  if (q) {
-    q->list = g_list_prepend (q->list, data);
+  if (q)
+    {
+      q->list = g_list_prepend (q->list, data);
 
-    if (q->list_end == NULL)
-      q->list_end = q->list;
+      if (q->list_end == NULL)
+        q->list_end = q->list;
 
-    q->list_size++;
-  }
+      q->list_size++;
+    }
 }
 
 
 void
 g_queue_push_back (GQueue *q, gpointer data)
 {
-  if (q) {
-    q->list_end = g_list_append (q->list_end, data);
+  if (q)
+    {
+      q->list_end = g_list_append (q->list_end, data);
 
-    if (! q->list)
-      q->list = q->list_end;
-    else
-      q->list_end = q->list_end->next;
+      if (! q->list)
+        q->list = q->list_end;
+      else
+        q->list_end = q->list_end->next;
 
-    q->list_size++;
-  }
+      q->list_size++;
+    }
 }
 
 
@@ -91,25 +95,28 @@ g_queue_pop_front (GQueue *q)
 {
   gpointer data = NULL;
 
-  if ((q) && (q->list)) {
-    GList *node;
-
-    node = q->list;
-    data = node->data;
-
-    if (! node->next) {
-      q->list = q->list_end = NULL;
-      q->list_size = 0;
-    }
-    else {
-      q->list = node->next;
-      q->list->prev = NULL;
-      q->list_size--;
+  if ((q) && (q->list))
+    {
+      GList *node;
+
+      node = q->list;
+      data = node->data;
+
+      if (! node->next)
+        {
+          q->list = q->list_end = NULL;
+          q->list_size = 0;
+        }
+      else
+        {
+          q->list = node->next;
+          q->list->prev = NULL;
+          q->list_size--;
+        }
+
+      g_list_free_1 (node);
     }
 
-    g_list_free_1 (node);
-  }
-
   return data;
 }
 
@@ -119,25 +126,28 @@ g_queue_pop_back (GQueue *q)
 {
   gpointer data = NULL;
 
-  if ((q) && (q->list)) {
-    GList *node;
-
-    node = q->list_end;
-    data = node->data;
-
-    if (! node->prev) {
-      q->list = q->list_end = NULL;
-      q->list_size = 0;
-    }
-    else {
-      q->list_end = node->prev;
-      q->list_end->next = NULL;
-      q->list_size--;
+  if ((q) && (q->list))
+    {
+      GList *node;
+
+      node = q->list_end;
+      data = node->data;
+
+      if (! node->prev)
+       {
+          q->list = q->list_end = NULL;
+          q->list_size = 0;
+        }
+      else
+       {
+          q->list_end = node->prev;
+          q->list_end->next = NULL;
+          q->list_size--;
+        }
+
+      g_list_free_1 (node);
     }
 
-    g_list_free_1 (node);
-  }
-
   return data;
 }
 

diff --git a/gstack.c b/gstack.c
index ff748ec60eb60e84b939712d996d74f26e9ee4dc..cd88789119b8264482b138596321afbc29eeee77 100644 (file)
--- a/gstack.c
+++ b/gstack.c
@@ -1,19 +1,28 @@
+/* GLIB - Library of useful routines for C programming
+ * Copyright (C) 1999 Free Software Foundation, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif
 #include <glib.h>
 
-/*
-* GStack, opaque ADT with interface:
-
-       stack = g_stack_new ();
-       count = g_stack_size (stack);
-
-       g_stack_push (stack, data);
-       data = g_stack_pop (stack);
-
-       slist = g_stack_get_list (stack);
-*/
 
 GStack *
 g_stack_new (void)
@@ -33,12 +42,13 @@ g_stack_new (void)
 void
 g_stack_free (GStack *stack)
 {
-  if (stack) {
-    if (stack->list)
-      g_list_free (stack->list);
+  if (stack)
+    {
+      if (stack->list)
+        g_list_free (stack->list);
 
-    g_free (stack);
-  }
+      g_free (stack);
+    }
 }
 
 
@@ -47,15 +57,16 @@ g_stack_pop (GStack *stack)
 {
   gpointer data = NULL;
 
-  if ((stack) && (stack->list)) {
-    GList *node = stack->list;
+  if ((stack) && (stack->list))
+    {
+      GList *node = stack->list;
 
-    stack->list = stack->list->next;
+      stack->list = stack->list->next;
 
-    data = node->data;
+      data = node->data;
 
-    g_list_free_1 (node);
-  }
+      g_list_free_1 (node);
+    }
 
   return data;
 }