Skip to content
Snippets Groups Projects
Commit fb8f2d04 authored by Lubos Slovak's avatar Lubos Slovak
Browse files

Fixed RDATA API and implementation.

A lot of syntax fixes (sorry, was not compileable before).

refs #88
parent bd947215
Branches
Tags
No related merge requests found
...@@ -19,8 +19,8 @@ dnslib_rdata_t *dnslib_rdata_new( uint count ) ...@@ -19,8 +19,8 @@ dnslib_rdata_t *dnslib_rdata_new( uint count )
rdata->items = NULL; rdata->items = NULL;
if (count > 0 (rdata->items = (dnslib_rdata_item_t *)calloc( if (count > 0 && (rdata->items = (dnslib_rdata_item_t *)calloc(
count * sizeof(dnslib_rdata_item_t)) == NULL)) { count, sizeof(dnslib_rdata_item_t))) == NULL) {
ERR_ALLOC_FAILED; ERR_ALLOC_FAILED;
free(rdata); free(rdata);
return NULL; return NULL;
...@@ -33,7 +33,7 @@ dnslib_rdata_t *dnslib_rdata_new( uint count ) ...@@ -33,7 +33,7 @@ dnslib_rdata_t *dnslib_rdata_new( uint count )
/*----------------------------------------------------------------------------*/ /*----------------------------------------------------------------------------*/
int dnslib_rdata_set_item( dnslib_rdata *rdata, uint pos, int dnslib_rdata_set_item( dnslib_rdata_t *rdata, uint pos,
dnslib_rdata_item_t item ) dnslib_rdata_item_t item )
{ {
if (pos >= rdata->count) { if (pos >= rdata->count) {
...@@ -45,7 +45,7 @@ int dnslib_rdata_set_item( dnslib_rdata *rdata, uint pos, ...@@ -45,7 +45,7 @@ int dnslib_rdata_set_item( dnslib_rdata *rdata, uint pos,
/*----------------------------------------------------------------------------*/ /*----------------------------------------------------------------------------*/
int dnslib_rdata_set_items( dnslib_rdata *rdata, int dnslib_rdata_set_items( dnslib_rdata_t *rdata,
const dnslib_rdata_item_t *items, uint count ) const dnslib_rdata_item_t *items, uint count )
{ {
if (count == 0) { if (count == 0) {
...@@ -55,7 +55,7 @@ int dnslib_rdata_set_items( dnslib_rdata *rdata, ...@@ -55,7 +55,7 @@ int dnslib_rdata_set_items( dnslib_rdata *rdata,
if (rdata->count == 0) { // empty so far, allocate new space if (rdata->count == 0) { // empty so far, allocate new space
assert(rdata->items == NULL); assert(rdata->items == NULL);
if ((rdata->items = (dnslib_rdata_item_t *)malloc( if ((rdata->items = (dnslib_rdata_item_t *)malloc(
count * sizeof(dnslib_rdata_item_t)) == NULL)) { count * sizeof(dnslib_rdata_item_t))) == NULL) {
ERR_ALLOC_FAILED; ERR_ALLOC_FAILED;
return -1; return -1;
} }
...@@ -71,7 +71,7 @@ int dnslib_rdata_set_items( dnslib_rdata *rdata, ...@@ -71,7 +71,7 @@ int dnslib_rdata_set_items( dnslib_rdata *rdata,
/*----------------------------------------------------------------------------*/ /*----------------------------------------------------------------------------*/
const dnslib_rdata_item_t *dnslib_rdata_get_item( dnslib_rdata_t *rdata, const dnslib_rdata_item_t *dnslib_rdata_get_item( const dnslib_rdata_t *rdata,
uint pos ) uint pos )
{ {
if (pos >= rdata->count) { if (pos >= rdata->count) {
......
...@@ -71,7 +71,7 @@ dnslib_rdata_t *dnslib_rdata_new( uint count ); ...@@ -71,7 +71,7 @@ dnslib_rdata_t *dnslib_rdata_new( uint count );
* \todo Use the union or a pointer to it as parameter? IMHO there is always * \todo Use the union or a pointer to it as parameter? IMHO there is always
* only one pointer that is copied, so it doesn't matter. * only one pointer that is copied, so it doesn't matter.
*/ */
int dnslib_rdata_set_item( dnslib_rdata *rdata, uint pos, int dnslib_rdata_set_item( dnslib_rdata_t *rdata, uint pos,
dnslib_rdata_item_t item ); dnslib_rdata_item_t item );
/*! /*!
...@@ -92,7 +92,7 @@ int dnslib_rdata_set_item( dnslib_rdata *rdata, uint pos, ...@@ -92,7 +92,7 @@ int dnslib_rdata_set_item( dnslib_rdata *rdata, uint pos,
* \retval -1 if allocation of necessary space was not successful. * \retval -1 if allocation of necessary space was not successful.
* \retval -2 if \a rdata->count != \a count. * \retval -2 if \a rdata->count != \a count.
*/ */
int dnslib_rdata_set_items( dnslib_rdata *rdata, int dnslib_rdata_set_items( dnslib_rdata_t *rdata,
const dnslib_rdata_item_t *items, uint count ); const dnslib_rdata_item_t *items, uint count );
/*! /*!
...@@ -107,7 +107,7 @@ int dnslib_rdata_set_items( dnslib_rdata *rdata, ...@@ -107,7 +107,7 @@ int dnslib_rdata_set_items( dnslib_rdata *rdata,
* \note Although returning union would be OK (no overhead), we need to be able * \note Although returning union would be OK (no overhead), we need to be able
* to distinguish errors (in this case by returning NULL). * to distinguish errors (in this case by returning NULL).
*/ */
const dnslib_rdata_item_t *dnslib_rdata_get_item( dnslib_rdata_t *rdata, const dnslib_rdata_item_t *dnslib_rdata_get_item( const dnslib_rdata_t *rdata,
uint pos ); uint pos );
/*! /*!
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment