-/* schemaparse.c - routines to parse config file objectclass definitions */
+/* oidm.c - object identifier macro routines */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2004 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
*/
#include "portable.h"
#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 ) {
if( pos ) {
int suflen = strlen(oid + pos);
- char *tmp = ch_malloc( om->som_oid.bv_len
+ char *tmp = SLAP_MALLOC( om->som_oid.bv_len
+ suflen + 1);
+ if( tmp == NULL ) {
+ Debug( LDAP_DEBUG_ANY,
+ "oidm_find: SLAP_MALLOC failed", 0, 0, 0 );
+ return NULL;
+ }
strcpy(tmp, om->som_oid.bv_val);
if( suflen ) {
suflen = om->som_oid.bv_len;
void
oidm_destroy()
{
- OidMacro *om, *n;
+ OidMacro *om;
+ while( !LDAP_SLIST_EMPTY( &om_list )) {
+ om = LDAP_SLIST_FIRST( &om_list );
+ LDAP_SLIST_REMOVE_HEAD( &om_list, som_next );
- for (om = om_list; om; om = n) {
- n = om->som_next;
ldap_charray_free(om->som_names);
free(om->som_oid.bv_val);
free(om);
+
}
}
const char *fname,
int lineno,
int argc,
- char **argv
-)
+ char **argv )
{
char *oid;
OidMacro *om;
return 1;
}
- om = (OidMacro *) ch_malloc( sizeof(OidMacro) );
+ om = (OidMacro *) SLAP_MALLOC( sizeof(OidMacro) );
+ if( om == NULL ) {
+ Debug( LDAP_DEBUG_ANY, "parse_oidm: SLAP_MALLOC failed", 0, 0, 0 );
+ 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;
}