X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf-text%2Ftypes%2Farray.c;h=d9f57a2f7133965370dd78d8fedd7d107e1e77ed;hp=3aaa633143ef48ee997d9239e26eb5e699353120;hb=0d69b916c5ba44b63a26aa038d416d6ee286306b;hpb=6743f229982176bfc2bdd2b3ab5c75ca62f45b35 diff --git a/formats/ctf-text/types/array.c b/formats/ctf-text/types/array.c index 3aaa6331..d9f57a2f 100644 --- a/formats/ctf-text/types/array.c +++ b/formats/ctf-text/types/array.c @@ -16,12 +16,20 @@ * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. */ #include #include -int ctf_text_array_write(struct stream_pos *ppos, struct definition *definition) +int ctf_text_array_write(struct bt_stream_pos *ppos, struct bt_definition *definition) { struct ctf_text_stream_pos *pos = ctf_text_pos(ppos); struct definition_array *array_definition = @@ -55,7 +63,7 @@ int ctf_text_array_write(struct stream_pos *ppos, struct definition *definition) && integer_declaration->p.alignment == CHAR_BIT)) { pos->string = array_definition->string; g_string_assign(array_definition->string, ""); - ret = array_rw(ppos, definition); + ret = bt_array_rw(ppos, definition); pos->string = NULL; } fprintf(pos->fp, "\"%s\"", array_definition->string->str); @@ -69,7 +77,7 @@ int ctf_text_array_write(struct stream_pos *ppos, struct definition *definition) } field_nr_saved = pos->field_nr; pos->field_nr = 0; - ret = array_rw(ppos, definition); + ret = bt_array_rw(ppos, definition); if (!pos->dummy) { pos->depth--; fprintf(pos->fp, " ]");