namespace definition_ref and definition_unref

[babeltrace.git] / types / integer.c

diff --git a/types/integer.c b/types/integer.c
index af5cc39fe8d98d589eb1ed2c5a6c249b546d592e..20e7688d80ebb17fe91a36eff3280776c109982b 100644 (file)
--- a/types/integer.c
+++ b/types/integer.c
@@ -16,6 +16,14 @@
  *
  * 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 <babeltrace/compiler.h>
@@ -77,7 +85,7 @@ struct definition *
        int ret;
 
        integer = g_new(struct definition_integer, 1);
-       declaration_ref(&integer_declaration->p);
+       bt_declaration_ref(&integer_declaration->p);
        integer->p.declaration = declaration;
        integer->declaration = integer_declaration;
        integer->p.ref = 1;
@@ -103,7 +111,7 @@ void _integer_definition_free(struct definition *definition)
        struct definition_integer *integer =
                container_of(definition, struct definition_integer, p);
 
-       declaration_unref(integer->p.declaration);
+       bt_declaration_unref(integer->p.declaration);
        g_free(integer);
 }
 
@@ -173,7 +181,8 @@ uint64_t get_unsigned_int(const struct definition *field)
        if (!integer_declaration->signedness) {
                return integer_definition->value._unsigned;
        }
-       fprintf(stderr, "[warning] Extracting unsigned value in a signed int\n");
+       fprintf(stderr, "[warning] Extracting unsigned value from a signed int (%s)\n",
+               g_quark_to_string(field->name));
        return (uint64_t)integer_definition->value._signed;
 }
 
@@ -188,6 +197,7 @@ int64_t get_signed_int(const struct definition *field)
        if (integer_declaration->signedness) {
                return integer_definition->value._signed;
        }
-       fprintf(stderr, "[warning] Extracting signed value in an unsigned int\n");
+       fprintf(stderr, "[warning] Extracting signed value from an unsigned int (%s)\n", 
+               g_quark_to_string(field->name));
        return (int64_t)integer_definition->value._unsigned;
 }