-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2012 Index Data
* See the file LICENSE for details.
- *
- * $Id: odr_util.c,v 1.12 2007-04-12 20:47:28 adam Exp $
*/
/**
* \file odr_util.c
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include "odr-priv.h"
#include <yaz/oid_util.h>
void odr_prname(ODR o, const char *name)
{
- if (name)
- odr_printf(o, "%*s%s ", o->op->indent*4, "", name);
+ if (o->op->indent < 16)
+ odr_printf(o, "%*s", o->op->indent * 2, "");
else
- odr_printf(o, "%*s", o->op->indent*4, "");
+ odr_printf(o, "level=%-7d%*s", o->op->indent,
+ 2 * (o->op->indent % 8) , "");
+ if (name)
+ odr_printf(o, "%s ", name);
}
int odp_more_chunks(ODR o, const unsigned char *base, int len)
if (!o)
return 0;
- if (!(r = (int *)nmem_malloc(nmem, (oid_oidlen(o) + 1) * sizeof(int))))
+ if (!(r = (Odr_oid *)
+ nmem_malloc(nmem, (oid_oidlen(o) + 1) * sizeof(Odr_oid))))
return 0;
oid_oidcpy(r, o);
return r;
Odr_oid *odr_getoidbystr_nmem(NMEM nmem, const char *str)
{
- int oid[OID_SIZE];
- int *ret;
+ Odr_oid oid[OID_SIZE];
+ Odr_oid *ret;
if (oid_dotstring_to_oid(str, oid))
return 0;
- ret = (int *)nmem_malloc(nmem, sizeof(*ret)*(oid_oidlen(oid) + 1));
+ ret = (Odr_oid *)nmem_malloc(nmem, sizeof(*ret)*(oid_oidlen(oid) + 1));
oid_oidcpy(ret, oid);
return ret;
}
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab