ncd/NCDVal: rename NCDValStringResource --> NCDValComposedStringResource

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);
     
-    NCDValStringResource resource;
+    NCDValComposedStringResource 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;
             
-            NCDValStringResource resource;
+            NCDValComposedStringResource resource;
             resource.func_getptr = cms_e->func_getptr;
             resource.user = cms_e->user;
             resource.ref_target = cms_e->ref.target;
@@ -989,7 +989,7 @@ fail:
     return NCDVal_NewInvalid();
 }
 
-NCDValRef NCDVal_NewComposedString (NCDValMem *mem, NCDValStringResource resource, size_t offset, size_t length)
+NCDValRef NCDVal_NewComposedString (NCDValMem *mem, NCDValComposedStringResource resource, size_t offset, size_t length)
 {
     NCDVal__AssertMem(mem);
     ASSERT(resource.func_getptr)
@@ -1087,7 +1087,7 @@ size_t NCDVal_StringLength (NCDValRef string)
     }
 }
 
-void NCDValStringResource_GetPtr (NCDValStringResource resource, size_t offset, size_t max_length, const char **out_data, size_t *out_length)
+void NCDValComposedStringResource_GetPtr (NCDValComposedStringResource resource, size_t offset, size_t max_length, const char **out_data, size_t *out_length)
 {
     ASSERT(max_length > 0)
     ASSERT(out_data)
@@ -1359,13 +1359,13 @@ NCDRefTarget * NCDVal_ExternalStringTarget (NCDValRef externalstring)
     return exs_e->ref.target;
 }
 
-NCDValStringResource NCDVal_ComposedStringResource (NCDValRef composedstring)
+NCDValComposedStringResource NCDVal_ComposedStringResource (NCDValRef composedstring)
 {
     ASSERT(NCDVal_IsComposedString(composedstring))
     
     struct NCDVal__composedstring *cms_e = NCDValMem__BufAt(composedstring.mem, composedstring.idx);
     
-    NCDValStringResource res;
+    NCDValComposedStringResource res;
     res.func_getptr = cms_e->func_getptr;
     res.user = cms_e->user;
     res.ref_target = cms_e->ref.target;

ncd/NCDVal.h

@@ -458,7 +458,7 @@ typedef struct {
     NCDVal_ComposedString_func_getptr func_getptr;
     void *user;
     NCDRefTarget *ref_target;
-} NCDValStringResource;
+} NCDValComposedStringResource;
 
 /**
  * Like {@link NCDVal_StringGetPtr}, but directly acceses a string resource backing a
@@ -467,7 +467,7 @@ typedef struct {
  * you should not access data outside of the range outside of the one defined by
  * {@link NCDVal_ComposedStringOffset} and {@link NCDVal_StringLength}.
  */
-void NCDValStringResource_GetPtr (NCDValStringResource resource, size_t offset, size_t max_length, const char **out_data, size_t *out_length);
+void NCDValComposedStringResource_GetPtr (NCDValComposedStringResource resource, size_t offset, size_t max_length, const char **out_data, size_t *out_length);
 
 /**
  * Builds a new ComposedString from a string resource.
@@ -477,7 +477,7 @@ void NCDValStringResource_GetPtr (NCDValStringResource resource, size_t offset,
  * 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, NCDValStringResource resource, size_t offset, size_t length);
+NCDValRef NCDVal_NewComposedString (NCDValMem *mem, NCDValComposedStringResource resource, size_t offset, size_t length);
 
 /**
  * Returns a pointer to the data of a ContinuousString.
@@ -611,7 +611,7 @@ NCDRefTarget * NCDVal_ExternalStringTarget (NCDValRef externalstring);
 /**
  * Returns the underlying string resource of a ComposedString.
  */
-NCDValStringResource NCDVal_ComposedStringResource (NCDValRef composedstring);
+NCDValComposedStringResource NCDVal_ComposedStringResource (NCDValRef composedstring);
 
 /**
  * Returns the resource offset of a ComposedString.