diff options
| author | Arthur de Jong <arthur@arthurdejong.org> | 2011-05-13 12:15:39 +0000 |
|---|---|---|
| committer | Arthur de Jong <arthur@arthurdejong.org> | 2011-05-13 12:15:39 +0000 |
| commit | 66bbb452261065da0fbba5160b255491cd47e762 (patch) | |
| tree | 96f54a2bcc7f9b4bdf385610952a358879253b30 /common | |
| parent | 478bd403f522b29cfc406c7335bcee2e5f3bf446 (diff) | |
switch variable expander function type name because _t suffix is reserved
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd@1458 ef36b2f9-881f-0410-afb5-c4e39611909c
Diffstat (limited to 'common')
| -rw-r--r-- | common/expr.c | 10 | ||||
| -rw-r--r-- | common/expr.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/common/expr.c b/common/expr.c index b5aaf5e..fc694cc 100644 --- a/common/expr.c +++ b/common/expr.c @@ -73,14 +73,14 @@ static const char *empty_expander(const char UNUSED(*name),void UNUSED(*expander /* definition of the parse functions (they call eachother) */ MUST_USE static const char *parse_dollar_expression( const char *str,int *ptr,char *buffer,size_t buflen, - expander_t expander,void *expander_arg); + expr_expander_func expander,void *expander_arg); MUST_USE static const char *parse_expression( const char *str,int *ptr,int endat,char *buffer,size_t buflen, - expander_t expander,void *expander_arg); + expr_expander_func expander,void *expander_arg); MUST_USE static const char *parse_dollar_expression( const char *str,int *ptr,char *buffer,size_t buflen, - expander_t expander,void *expander_arg) + expr_expander_func expander,void *expander_arg) { char varname[MAXVARLENGTH]; const char *varvalue; @@ -157,7 +157,7 @@ MUST_USE static const char *parse_dollar_expression( MUST_USE static const char *parse_expression( const char *str,int *ptr,int endat,char *buffer,size_t buflen, - expander_t expander,void *expander_arg) + expr_expander_func expander,void *expander_arg) { int j=0; /* go over string */ @@ -190,7 +190,7 @@ MUST_USE static const char *parse_expression( } MUST_USE const char *expr_parse(const char *str,char *buffer,size_t buflen, - expander_t expander,void *expander_arg) + expr_expander_func expander,void *expander_arg) { int i=0; diff --git a/common/expr.h b/common/expr.h index 81b0e27..0ff2c28 100644 --- a/common/expr.h +++ b/common/expr.h @@ -26,13 +26,13 @@ #include "compat/attrs.h" #include "common/set.h" -typedef const char *(*expander_t)(const char *name,void *expander_arg); +typedef const char *(*expr_expander_func)(const char *name,void *expander_arg); /* Parse the expression and store the result in buffer, using the expander function to expand variable names to values. If the expression is invalid or the result didn't fit in the buffer NULL is returned. */ MUST_USE const char *expr_parse(const char *expr,char *buffer,size_t buflen, - expander_t expander,void *expander_arg); + expr_expander_func expander,void *expander_arg); /* Return the variable names that are used in expr. If set is NULL a new one is allocated, otherwise the passed set is added to. */ |