nss-pam-ldapd commit: r1458 - nss-pam-ldapd/common

[Commits of the nss-pam-ldapd project <nss-pam-ldapd-commits [at] lists.arthurdejong.org>]

Author: arthur
Date: Fri May 13 14:15:39 2011
New Revision: 1458
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?view=rev&revision=1458

Log:
switch variable expander function type name because _t suffix is reserved

Modified:
   nss-pam-ldapd/common/expr.c
   nss-pam-ldapd/common/expr.h

Modified: nss-pam-ldapd/common/expr.c
==============================================================================
--- nss-pam-ldapd/common/expr.c Fri May 13 13:57:54 2011        (r1457)
+++ nss-pam-ldapd/common/expr.c Fri May 13 14:15:39 2011        (r1458)
@@ -73,14 +73,14 @@
 /* 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_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 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;

Modified: nss-pam-ldapd/common/expr.h
==============================================================================
--- nss-pam-ldapd/common/expr.h Fri May 13 13:57:54 2011        (r1457)
+++ nss-pam-ldapd/common/expr.h Fri May 13 14:15:39 2011        (r1458)
@@ -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. */
-- 
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits