Always return prop names, even when invalid

das-developers · Mar 8, 2024 · 9cbb316 · 9cbb316
1 parent a05202c
commit 9cbb316
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/das2/property.c b/das2/property.c
@@ -307,12 +307,14 @@ bool DasProp_isSet(const DasProp* pProp){
 	return ((uint32_t)pProp->flags & DASPROP_SET);
 }
 
+/* 
 const char* DasProp_name(const DasProp* pProp)
 {
 	if(! (pProp->flags & DASPROP_MULTI_MASK))
 		return NULL;
 	return pProp->buffer;
 }
+*/
 
 const char* DasProp_value(const DasProp* pProp)
 {

diff --git a/das2/property.h b/das2/property.h
@@ -119,7 +119,9 @@ size_t DasProp_size(const DasProp* pProp);
 /** Get name of a property 
  * @memberof DasProp
  */
-const char* DasProp_name(const DasProp* pProp);
+#define DasProp_name(P) ((P)->buffer) 
+
+/* const char* DasProp_name(const DasProp* pProp); */
 
 /** Get the string value for a property 
  * @memberof DasProp