From fb8f2d044e12c6ca62779200727ccd20b1dc0549 Mon Sep 17 00:00:00 2001
From: Lubos Slovak <lubos.slovak@nic.cz>
Date: Tue, 9 Nov 2010 19:46:06 +0100
Subject: [PATCH] Fixed RDATA API and implementation.
A lot of syntax fixes (sorry, was not compileable before).
refs #88
---
src/dnslib/rdata.c | 12 ++++++------
src/dnslib/rdata.h | 6 +++---
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/dnslib/rdata.c b/src/dnslib/rdata.c
index 85d6788bc..7693c246e 100644
--- a/src/dnslib/rdata.c
+++ b/src/dnslib/rdata.c
@@ -19,8 +19,8 @@ dnslib_rdata_t *dnslib_rdata_new( uint count )
rdata->items = NULL;
- if (count > 0 (rdata->items = (dnslib_rdata_item_t *)calloc(
- count * sizeof(dnslib_rdata_item_t)) == NULL)) {
+ if (count > 0 && (rdata->items = (dnslib_rdata_item_t *)calloc(
+ count, sizeof(dnslib_rdata_item_t))) == NULL) {
ERR_ALLOC_FAILED;
free(rdata);
return NULL;
@@ -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 )
{
if (pos >= rdata->count) {
@@ -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 )
{
if (count == 0) {
@@ -55,7 +55,7 @@ int dnslib_rdata_set_items( dnslib_rdata *rdata,
if (rdata->count == 0) { // empty so far, allocate new space
assert(rdata->items == NULL);
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;
return -1;
}
@@ -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 )
{
if (pos >= rdata->count) {
diff --git a/src/dnslib/rdata.h b/src/dnslib/rdata.h
index d99f3b87c..28339b94e 100644
--- a/src/dnslib/rdata.h
+++ b/src/dnslib/rdata.h
@@ -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
* 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 );
/*!
@@ -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 -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 );
/*!
@@ -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
* 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 );
/*!
--
GitLab