From f81663174842b5981be45679e694f24d31700ede Mon Sep 17 00:00:00 2001 From: hadaq Date: Wed, 12 May 2004 12:27:30 +0000 Subject: [PATCH] indent --- allParam/rpc/pcache.c | 73 ++++++++++++++++++++++++------------------- allParam/rpc/pcache.h | 20 ++++++++---- 2 files changed, 54 insertions(+), 39 deletions(-) diff --git a/allParam/rpc/pcache.c b/allParam/rpc/pcache.c index 8cd0cd0..850d403 100644 --- a/allParam/rpc/pcache.c +++ b/allParam/rpc/pcache.c @@ -5,24 +5,26 @@ #include "pcache.h" -static int PData_invariant(const PData *my) { +static int PData_invariant(const PData * my) +{ int retVal; retVal = my != NULL && my->name != NULL && my->idx != NULL && (my->type == PInt); - + return retVal; } -static PData *newPInt(const char *name, const char *idx, unsigned long int value) { +static PData *newPInt(const char *name, const char *idx, unsigned long int value) +{ PData *my = malloc(sizeof(PData)); - my->name = malloc(strlen(name)+1); + my->name = malloc(strlen(name) + 1); strcpy(my->name, name); - my->idx = malloc(strlen(idx)+1); + my->idx = malloc(strlen(idx) + 1); strcpy(my->idx, idx); my->type = PInt; @@ -32,7 +34,8 @@ static PData *newPInt(const char *name, const char *idx, unsigned long int value return my; } -static void delPData(PData *my) { +static void delPData(PData * my) +{ if (my != NULL) { switch (my->type) { case PInt: @@ -44,18 +47,19 @@ static void delPData(PData *my) { } } -static int compare(const PData *my, const char *name, const char *idx) { +static int compare(const PData * my, const char *name, const char *idx) +{ int retVal; retVal = strcmp(my->idx, idx); if (retVal == 0) { retVal = strcmp(my->name, name); } - return retVal < 0 ? -1 : retVal > 0 ? 1 : 0; } -static PCache *insert(PCache *my, const char *name, const char *idx, unsigned long int value) { +static PCache *insert(PCache * my, const char *name, const char *idx, unsigned long int value) +{ if (my == NULL) { my = malloc(sizeof(PCache)); my->r = NULL; @@ -63,50 +67,53 @@ static PCache *insert(PCache *my, const char *name, const char *idx, unsigned lo my->data = newPInt(name, idx, value); } else { switch (compare(my->data, name, idx)) { - case 0: - delPData(my->data); - my->data = newPInt(name, idx, value); - break; - case -1: - my->l = insert(my->l, name, idx, value); - break; - case 1: - my->r = insert(my->r, name, idx, value); - break; + case 0: + delPData(my->data); + my->data = newPInt(name, idx, value); + break; + case -1: + my->l = insert(my->l, name, idx, value); + break; + case 1: + my->r = insert(my->r, name, idx, value); + break; } } return my; } -static PData *find(const PCache *my, const char *name, const char *idx) { +static PData *find(const PCache * my, const char *name, const char *idx) +{ PData *retVal; if (my == NULL) { retVal = NULL; } else { switch (compare(my->data, name, idx)) { - case 0: - retVal = my->data; - break; - case -1: - retVal = find(my->l, name, idx); - break; - case 1: - retVal = find(my->r, name, idx); - break; + case 0: + retVal = my->data; + break; + case -1: + retVal = find(my->l, name, idx); + break; + case 1: + retVal = find(my->r, name, idx); + break; } } return retVal; } -int PCache_storeInt(PCache **my, const char *name, const char *idx, unsigned long int value) { +int PCache_storeInt(PCache ** my, const char *name, const char *idx, unsigned long int value) +{ - *my = insert(*my, name, idx, value); + *my = insert(*my, name, idx, value); return 0; } - -int PCache_getInt(const PCache *my, const char *name, const char *idx, unsigned long int *value) { + +int PCache_getInt(const PCache * my, const char *name, const char *idx, unsigned long int *value) +{ int retVal; const PData *data; diff --git a/allParam/rpc/pcache.h b/allParam/rpc/pcache.h index f977c02..3bc2a28 100644 --- a/allParam/rpc/pcache.h +++ b/allParam/rpc/pcache.h @@ -1,9 +1,16 @@ + #ifndef PCHE_H #define PCHE_H -enum PType { PInt }; +enum PType { + PInt +}; + #if 0 -enum PType { PInt, PString, PIntArray, PStringArray }; +enum PType { + PInt, PString, PIntArray, PStringArray +}; + #endif struct PDataS { @@ -15,9 +22,10 @@ struct PDataS { char *PString; unsigned long int *PIntArray; char **PStringArray; - } value; + } + value; }; -typedef struct PDataS PData; +typedef struct PDataS PData; struct PCacheS { struct PCacheS *r; @@ -26,7 +34,7 @@ struct PCacheS { }; typedef struct PCacheS PCache; -int PCache_storeInt(PCache **my, const char *name, const char *idx, unsigned long int value); -int PCache_getInt(const PCache *my, const char *name, const char *idx, unsigned long int *value); +int PCache_storeInt(PCache ** my, const char *name, const char *idx, unsigned long int value); +int PCache_getInt(const PCache * my, const char *name, const char *idx, unsigned long int *value); #endif -- 2.43.0