#include "slap.h"
-static OidMacro *om_list = NULL;
+static LDAP_SLIST_HEAD(OidMacroList, slap_oid_macro) om_list
+ = LDAP_SLIST_HEAD_INITIALIZER(om_list);
/* Replace an OID Macro invocation with its full numeric OID.
* If the macro is used with "macroname:suffix" append ".suffix"
return oid;
}
- for (om = om_list; om; om=om->som_next) {
+ LDAP_SLIST_FOREACH( om, &om_list, som_next ) {
char **names = om->som_names;
if( names == NULL ) {
void
oidm_destroy()
{
- OidMacro *om, *n;
- for (om = om_list; om; om = n) {
- n = om->som_next;
+#ifdef SLAP_NVALUES
+ /* FIXME: this causes a malloc debug error */
+#else
+ OidMacro *om;
+ while( !LDAP_SLIST_EMPTY( &om_list )) {
+ om = LDAP_SLIST_FIRST( &om_list );
+
ldap_charray_free(om->som_names);
free(om->som_oid.bv_val);
free(om);
+
+ LDAP_SLIST_REMOVE_HEAD( &om_list, som_next );
}
+#endif
}
int
const char *fname,
int lineno,
int argc,
- char **argv
-)
+ char **argv )
{
char *oid;
OidMacro *om;
return 1;
}
+ LDAP_SLIST_NEXT( om, som_next ) = NULL;
om->som_names = NULL;
ldap_charray_add( &om->som_names, argv[1] );
om->som_oid.bv_val = oidm_find( argv[2] );
}
om->som_oid.bv_len = strlen( om->som_oid.bv_val );
- om->som_next = om_list;
- om_list = om;
+ LDAP_SLIST_INSERT_HEAD( &om_list, om, som_next );
return 0;
}