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.
This commit is contained in:
Jeff Garzik
1999-03-17 15:38:18 +00:00
committed by Jeff Garzik
parent 771d712085
commit 05f42cc0e2
11 changed files with 225 additions and 154 deletions

142
gqueue.c
View File

@@ -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,24 +95,27 @@ g_queue_pop_front (GQueue *q)
{
gpointer data = NULL;
if ((q) && (q->list)) {
GList *node;
if ((q) && (q->list))
{
GList *node;
node = q->list;
data = node->data;
node = q->list;
data = node->data;
if (! node->next) {
q->list = q->list_end = NULL;
q->list_size = 0;
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);
}
else {
q->list = node->next;
q->list->prev = NULL;
q->list_size--;
}
g_list_free_1 (node);
}
return data;
}
@@ -119,24 +126,27 @@ g_queue_pop_back (GQueue *q)
{
gpointer data = NULL;
if ((q) && (q->list)) {
GList *node;
if ((q) && (q->list))
{
GList *node;
node = q->list_end;
data = node->data;
node = q->list_end;
data = node->data;
if (! node->prev) {
q->list = q->list_end = NULL;
q->list_size = 0;
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);
}
else {
q->list_end = node->prev;
q->list_end->next = NULL;
q->list_size--;
}
g_list_free_1 (node);
}
return data;
}