From f6ea661f6cd0782e31215448efd3f998df0ffff9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Wilfried=20G=C3=B6esgens?= Date: Sat, 14 Feb 2009 11:38:08 +0000 Subject: [PATCH] * return whether we removed a pattern or not. --- libcitadel/debian/files | 6 +++--- libcitadel/lib/libcitadel.h | 2 +- libcitadel/lib/tools.c | 6 ++++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/libcitadel/debian/files b/libcitadel/debian/files index 73fc3064e..d2ac0561c 100644 --- a/libcitadel/debian/files +++ b/libcitadel/debian/files @@ -1,3 +1,3 @@ -libcitadel1_7.38-8_amd64.deb libs optional -libcitadel1-dbg_7.38-8_amd64.deb libdevel optional -libcitadel-dev_7.38-8_amd64.deb libdevel optional +libcitadel1_7.38-8_i386.deb libs optional +libcitadel1-dbg_7.38-8_i386.deb libdevel optional +libcitadel-dev_7.38-8_i386.deb libdevel optional diff --git a/libcitadel/lib/libcitadel.h b/libcitadel/lib/libcitadel.h index 50d87f241..32fbd6eb9 100644 --- a/libcitadel/lib/libcitadel.h +++ b/libcitadel/lib/libcitadel.h @@ -331,7 +331,7 @@ char *memreadline(char *start, char *buf, int maxlen); char *memreadlinelen(char *start, char *buf, int maxlen, int *retlen); #define IsEmptyStr(a) ((a)[0] == '\0') #define num_parms(source) num_tokens(source,(char)'|') -void stripout(char *str, char leftboundary, char rightboundary); +int stripout(char *str, char leftboundary, char rightboundary); void stripallbut(char *str, char leftboundary, char rightboundary); char *myfgets(char *s, int size, FILE *stream); void urlesc(char *outbuf, size_t oblen, char *strbuf); diff --git a/libcitadel/lib/tools.c b/libcitadel/lib/tools.c index 48a55fdf8..a772bcade 100644 --- a/libcitadel/lib/tools.c +++ b/libcitadel/lib/tools.c @@ -648,7 +648,7 @@ char *memreadlinelen(char *start, char *buf, int maxlen, int *retlen) * Strip a boundarized substring out of a string (for example, remove * parentheses and anything inside them). */ -void stripout(char *str, char leftboundary, char rightboundary) { +int stripout(char *str, char leftboundary, char rightboundary) { int a; int lb = (-1); int rb = (-1); @@ -660,12 +660,14 @@ void stripout(char *str, char leftboundary, char rightboundary) { if ( (lb > 0) && (rb > lb) ) { strcpy(&str[lb - 1], &str[rb + 1]); + return 1; } else if ( (lb == 0) && (rb > lb) ) { strcpy(str, &str[rb + 1]); + return 1; } - + return 0; } -- 2.30.2