diff options
author | Jörg Mayer <jmayer@loplof.de> | 2002-08-28 21:04:11 +0000 |
---|---|---|
committer | Jörg Mayer <jmayer@loplof.de> | 2002-08-28 21:04:11 +0000 |
commit | 7c4176d8688d6642026d3d322570663c9655c7db (patch) | |
tree | fb24347c14c65d6b8d7f7e93e4060abbb7217e0c /conditions.c | |
parent | 48be4e530d6635dbf1ef1dafa984c2060f3caa8a (diff) |
Removed trailing whitespaces from .h and .c files using the
winapi_cleanup tool written by Patrik Stridvall for the wine
project.
svn path=/trunk/; revision=6117
Diffstat (limited to 'conditions.c')
-rw-r--r-- | conditions.c | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/conditions.c b/conditions.c index 6971462f42..b9ae406f27 100644 --- a/conditions.c +++ b/conditions.c @@ -1,22 +1,22 @@ /* conditions.c * Implementation for condition handler. * - * $Id: conditions.c,v 1.2 2002/05/04 09:19:09 guy Exp $ + * $Id: conditions.c,v 1.3 2002/08/28 21:00:06 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program 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 General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -27,7 +27,7 @@ #include <stdarg.h> #include "conditions.h" -/* container for condition classes */ +/* container for condition classes */ static GHashTable* classes = NULL; /* condition data structure declaration */ @@ -35,7 +35,7 @@ struct condition{ char* class_id; void* user_data; _cnd_eval eval_func; - _cnd_reset reset_func; + _cnd_reset reset_func; }; /* structure used to store class functions in GHashTable */ @@ -51,21 +51,21 @@ static void _cnd_init(); static void _cnd_find_hash_key_for_class_id(gpointer, gpointer, gpointer); condition* cnd_new(const char* class_id, ...){ - va_list ap; + va_list ap; condition *cnd = NULL, *cnd_ref = NULL; _cnd_class *cls = NULL; char* id = NULL; - /* check if hash table is already initialized */ + /* check if hash table is already initialized */ _cnd_init(); - /* get class structure for this id */ + /* get class structure for this id */ if((cls = (_cnd_class*)g_hash_table_lookup(classes, class_id)) == NULL) return NULL; - /* initialize the basic structure */ + /* initialize the basic structure */ if((cnd_ref = (condition*)malloc(sizeof(condition))) == NULL) return NULL; cnd_ref->user_data = NULL; cnd_ref->eval_func = cls->eval_func; cnd_ref->reset_func = cls->reset_func; - /* copy the class id */ + /* copy the class id */ if((id = (char*)malloc(strlen(class_id)+1)) == NULL){ free(cnd_ref); return NULL; @@ -89,11 +89,11 @@ void cnd_delete(condition *cnd){ const char* class_id = cnd->class_id; /* check for valid pointer */ if(cnd == NULL) return; - /* check if hash table is already initialized */ + /* check if hash table is already initialized */ _cnd_init(); - /* get the condition class */ + /* get the condition class */ cls = (_cnd_class*)g_hash_table_lookup(classes, class_id); - /* call class specific destructor */ + /* call class specific destructor */ if(cls != NULL) (cls->destr_func)(cnd); /* free memory */ free(cnd->class_id); @@ -102,11 +102,11 @@ void cnd_delete(condition *cnd){ } /* END cnd_delete() */ gboolean cnd_eval(condition *cnd, ...){ - va_list ap; + va_list ap; gboolean ret_val = FALSE; /* validate cnd */ if(cnd == NULL) return FALSE; - /* call specific handler */ + /* call specific handler */ va_start(ap, cnd); ret_val = (cnd->eval_func)(cnd, ap); va_end(ap); @@ -119,11 +119,11 @@ void cnd_reset(condition *cnd){ void* cnd_get_user_data(condition *cnd){ return cnd->user_data; -} /* END cnd_get_user_data() */ +} /* END cnd_get_user_data() */ void cnd_set_user_data(condition *cnd, void* user_data){ cnd->user_data = user_data; -} /* END cnd_set_user_data() */ +} /* END cnd_set_user_data() */ gboolean cnd_register_class(const char* class_id, _cnd_constr constr_func, @@ -133,19 +133,19 @@ gboolean cnd_register_class(const char* class_id, char* key = NULL; _cnd_class *cls = NULL; /* check for valid parameters */ - if((constr_func == NULL) || (destr_func == NULL) || + if((constr_func == NULL) || (destr_func == NULL) || (eval_func == NULL) || (reset_func == NULL) || (class_id == NULL)) return FALSE; - /* check if hash table is already initialized */ + /* check if hash table is already initialized */ _cnd_init(); - /* check for unique class id */ + /* check for unique class id */ if((cls = (_cnd_class*)g_hash_table_lookup(classes, class_id)) != NULL) return FALSE; /* GHashTable keys need to be persistent for the lifetime of the hash table. Allocate memory and copy the class id which we use as key. */ if((key = (char*)malloc(strlen(class_id)+1)) == NULL) return FALSE; strcpy(key, class_id); - /* initialize class structure */ + /* initialize class structure */ if((cls = (_cnd_class*)malloc(sizeof(_cnd_class))) == NULL){ free(key); return FALSE; @@ -163,20 +163,20 @@ static char* pkey = NULL; void cnd_unregister_class(const char* class_id){ char *key = (char*)class_id; _cnd_class *cls = NULL; - /* check if hash table is already initialized */ + /* check if hash table is already initialized */ _cnd_init(); - /* find the key for this class id and store it in 'pkey' */ + /* find the key for this class id and store it in 'pkey' */ g_hash_table_foreach(classes, _cnd_find_hash_key_for_class_id, key); /* find the class structure for this class id */ cls = (_cnd_class*)g_hash_table_lookup(classes, class_id); /* remove constructor from hash table */ - g_hash_table_remove(classes, class_id); - /* free the key */ + g_hash_table_remove(classes, class_id); + /* free the key */ free(pkey); pkey = NULL; - /* free the value */ + /* free the value */ free(cls); } /* END cnd_unregister_class() */ @@ -185,13 +185,13 @@ void cnd_unregister_class(const char* class_id){ */ static void _cnd_init(){ if(classes != NULL) return; - /* create hash table, we use strings as keys */ + /* create hash table, we use strings as keys */ classes = g_hash_table_new(g_str_hash, g_str_equal); } /* END _cnd_init() */ /* * Callback for function 'g_hash_table_foreach()'. - * We don't keep references to hash table keys. Keys have memory allocated + * We don't keep references to hash table keys. Keys have memory allocated * which must be freed when they are not used anymore. This function finds * the reference to a key corresponding to a particular class id. The reference * to the key is stored in a global variable. @@ -200,6 +200,6 @@ void _cnd_find_hash_key_for_class_id(gpointer key, gpointer value _U_, gpointer user_data){ char* class_id = (char*)user_data; - char* key_value = (char*)key; + char* key_value = (char*)key; if(strcmp(class_id, key_value) == 0) pkey = key; -} /* END _cnd_find_hash_key_for_class_id() */ +} /* END _cnd_find_hash_key_for_class_id() */ |