From 476edf8cbc6b9e303f07a08146f2cd7f3b0287f4 Mon Sep 17 00:00:00 2001
From: Jan Kadlec <jan.kadlec@nic.cz>
Date: Wed, 13 Feb 2013 17:40:45 +0100
Subject: [PATCH] Removed obsolete member from dname structure.
---
src/libknot/dname.c | 26 --------------------------
src/libknot/dname.h | 7 -------
2 files changed, 33 deletions(-)
diff --git a/src/libknot/dname.c b/src/libknot/dname.c
index 5c1f143ba..07cd5bfda 100644
--- a/src/libknot/dname.c
+++ b/src/libknot/dname.c
@@ -382,7 +382,6 @@ knot_dname_t *knot_dname_new()
dname->node = NULL;
dname->labels = NULL;
dname->label_count = -1;
- dname->id = 0;
/* Initialize reference counting. */
ref_init(&dname->ref, knot_dname_dtor);
@@ -434,8 +433,6 @@ dbg_dname_exec_verb(
assert(dname->name != NULL);
dname->node = node;
- dname->id = 0;
-
return dname;
}
@@ -473,8 +470,6 @@ knot_dname_t *knot_dname_new_from_wire(const uint8_t *name, uint size,
}
dname->node = node;
- dname->id = 0;
-
return dname;
}
@@ -591,7 +586,6 @@ int knot_dname_from_wire(const uint8_t *name, uint size,
memcpy(target->name, name, size);
target->size = size;
target->node = node;
- target->id = 0;
return knot_dname_find_labels(target, 0);
}
@@ -728,13 +722,6 @@ uint knot_dname_size(const knot_dname_t *dname)
/*----------------------------------------------------------------------------*/
-unsigned int knot_dname_id(const knot_dname_t *dname)
-{
- return dname->id;
-}
-
-/*----------------------------------------------------------------------------*/
-
uint8_t knot_dname_size_part(const knot_dname_t *dname, int labels)
{
assert(labels < dname->label_count);
@@ -1164,16 +1151,3 @@ knot_dname_t *knot_dname_cat(knot_dname_t *d1, const knot_dname_t *d2)
return d1;
}
-void knot_dname_set_id(knot_dname_t *dname, unsigned int id)
-{
- dname->id = id;
-}
-
-unsigned int knot_dname_get_id(const knot_dname_t *dname)
-{
- if (dname != NULL) {
- return dname->id;
- } else {
- return 0; /* 0 should never be used and is reserved for err. */
- }
-}
diff --git a/src/libknot/dname.h b/src/libknot/dname.h
index 5827c9883..4269cdda3 100644
--- a/src/libknot/dname.h
+++ b/src/libknot/dname.h
@@ -47,7 +47,6 @@ struct knot_dname {
uint8_t *name; /*!< Wire format of the domain name. */
uint8_t *labels;
struct knot_node *node; /*!< Zone node the domain name belongs to. */
- unsigned int id; /*!< ID of domain name used in zone dumping. */
/*!
* \brief Size of the domain name in octets.
@@ -214,8 +213,6 @@ const uint8_t *knot_dname_name(const knot_dname_t *dname);
*/
unsigned int knot_dname_size(const knot_dname_t *dname);
-unsigned int knot_dname_id(const knot_dname_t *dname);
-
/*!
* \brief Returns size of a part of domain name.
*
@@ -393,10 +390,6 @@ int knot_dname_compare_non_canon(const knot_dname_t *d1,
*/
knot_dname_t *knot_dname_cat(knot_dname_t *d1, const knot_dname_t *d2);
-void knot_dname_set_id(knot_dname_t *dname, unsigned int id);
-
-unsigned int knot_dname_get_id(const knot_dname_t *dname);
-
/*!
* \brief Increment reference counter for dname.
*
--
GitLab