ncd: NCDVal: rename struct NCDVal_string_resource --> typedef NCDValStringResource

examples/ncdval_test.c

@@ -113,7 +113,7 @@ static NCDValRef build_composed_string (NCDValMem *mem, const char *data, size_t
     
     NCDRefTarget_Init(&cs->ref_target, composed_string_ref_target_func_release);
     
-    struct NCDVal_string_resource resource;
+    NCDValStringResource resource;
     resource.func_getptr = composed_string_func_getptr;
     resource.user = cs;
     resource.ref_target = &cs->ref_target;

ncd/NCDVal.c

@@ -633,7 +633,7 @@ NCDValRef NCDVal_NewCopy (NCDValMem *mem, NCDValRef val)
         case COMPOSEDSTRING_TYPE: {
             struct NCDVal__composedstring *cms_e = ptr;
             
-            struct NCDVal_string_resource resource;
+            NCDValStringResource resource;
             resource.func_getptr = cms_e->func_getptr;
             resource.user = cms_e->user;
             resource.ref_target = cms_e->ref.target;
@@ -948,7 +948,7 @@ fail:
     return NCDVal_NewInvalid();
 }
 
-NCDValRef NCDVal_NewComposedString (NCDValMem *mem, struct NCDVal_string_resource resource, size_t offset, size_t length)
+NCDValRef NCDVal_NewComposedString (NCDValMem *mem, NCDValStringResource resource, size_t offset, size_t length)
 {
     NCDVal__AssertMem(mem);
     ASSERT(resource.func_getptr)
@@ -1206,13 +1206,13 @@ NCDRefTarget * NCDVal_ExternalStringTarget (NCDValRef externalstring)
     return exs_e->ref.target;
 }
 
-struct NCDVal_string_resource NCDVal_ComposedStringResource (NCDValRef composedstring)
+NCDValStringResource NCDVal_ComposedStringResource (NCDValRef composedstring)
 {
     ASSERT(NCDVal_IsComposedString(composedstring))
     
     struct NCDVal__composedstring *cms_e = NCDValMem__BufAt(composedstring.mem, composedstring.idx);
     
-    struct NCDVal_string_resource res;
+    NCDValStringResource res;
     res.func_getptr = cms_e->func_getptr;
     res.user = cms_e->user;
     res.ref_target = cms_e->ref.target;

ncd/NCDVal.h

@@ -440,11 +440,11 @@ typedef void (*NCDVal_ComposedString_func_getptr) (void *user, size_t offset, co
  * Structure representing a string resource used by ComposedString's,
  * to simplify {@link NCDVal_NewComposedString} and {@link NCDVal_ComposedStringResource}.
  */
-struct NCDVal_string_resource {
+typedef struct {
     NCDVal_ComposedString_func_getptr func_getptr;
     void *user;
     NCDRefTarget *ref_target;
-};
+} NCDValStringResource;
 
 /**
  * Builds a new ComposedString from a string resource.
@@ -454,7 +454,7 @@ struct NCDVal_string_resource {
  * A ComposedString is a kind of String with an abstract representation exposed via the
  * {@link NCDVal_ComposedString_func_getptr} callback.
  */
-NCDValRef NCDVal_NewComposedString (NCDValMem *mem, struct NCDVal_string_resource resource, size_t offset, size_t length);
+NCDValRef NCDVal_NewComposedString (NCDValMem *mem, NCDValStringResource resource, size_t offset, size_t length);
 
 /**
  * Returns a pointer to the data of a ContinuousString.
@@ -555,7 +555,7 @@ NCDRefTarget * NCDVal_ExternalStringTarget (NCDValRef externalstring);
 /**
  * Returns the underlying string resource of a ComposedString.
  */
-struct NCDVal_string_resource NCDVal_ComposedStringResource (NCDValRef composedstring);
+NCDValStringResource NCDVal_ComposedStringResource (NCDValRef composedstring);
 
 /**
  * Returns the resource offset of a ComposedString.