X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Ftypes%2Ffloat.c;h=afe5e8d2cf2ef9d66a1cce2df2727bea70a4ba34;hp=782f72bfef514433303a9c232188e86bee4f4e80;hb=70fd5a515016525961d4bef0d627616abdc9bc28;hpb=08c82b90d94a6dfee1f3da4ec06864c6045c07f7

diff --git a/formats/ctf/types/float.c b/formats/ctf/types/float.c
index 782f72bf..afe5e8d2 100644
--- a/formats/ctf/types/float.c
+++ b/formats/ctf/types/float.c
@@ -17,6 +17,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.
+ *
  * Reference: ISO C99 standard 5.2.4
  */
 
@@ -88,9 +96,9 @@ static void float_unlock(void)
 	assert(!ret);
 }
 
-int _ctf_float_copy(struct stream_pos *destp,
+static int _ctf_float_copy(struct bt_stream_pos *destp,
 		    struct definition_float *dest_definition,
-		    struct stream_pos *srcp,
+		    struct bt_stream_pos *srcp,
 		    const struct definition_float *src_definition)
 {
 	int ret;
@@ -157,7 +165,7 @@ int _ctf_float_copy(struct stream_pos *destp,
 	return 0;
 }
 
-int ctf_float_read(struct stream_pos *ppos, struct definition *definition)
+int ctf_float_read(struct bt_stream_pos *ppos, struct bt_definition *definition)
 {
 	struct definition_float *float_definition =
 		container_of(definition, struct definition_float, p);
@@ -165,7 +173,7 @@ int ctf_float_read(struct stream_pos *ppos, struct definition *definition)
 		float_definition->declaration;
 	struct ctf_stream_pos *pos = ctf_pos(ppos);
 	union doubleIEEE754 u;
-	struct definition *tmpdef;
+	struct bt_definition *tmpdef;
 	struct definition_float *tmpfloat;
 	struct ctf_stream_pos destp;
 	struct mmap_align mma;
@@ -189,11 +197,14 @@ int ctf_float_read(struct stream_pos *ppos, struct definition *definition)
 	}
 	tmpfloat = container_of(tmpdef, struct definition_float, p);
 	memset(&destp, 0, sizeof(destp));
-	ctf_init_pos(&destp, -1, O_RDWR);
+	ctf_init_pos(&destp, NULL, -1, O_RDWR);
 	mmap_align_set_addr(&mma, (char *) u.bits);
 	destp.base_mma = &mma;
 	destp.packet_size = sizeof(u) * CHAR_BIT;
-	ctf_align_pos(pos, float_declaration->p.alignment);
+	if (!ctf_align_pos(pos, float_declaration->p.alignment)) {
+		ret = -EFAULT;
+		goto end_unref;
+	}
 	ret = _ctf_float_copy(&destp.parent, tmpfloat, ppos, float_definition);
 	switch (float_declaration->mantissa->len + 1) {
 	case FLT_MANT_DIG:
@@ -208,13 +219,13 @@ int ctf_float_read(struct stream_pos *ppos, struct definition *definition)
 	}
 
 end_unref:
-	definition_unref(tmpdef);
+	bt_definition_unref(tmpdef);
 end:
 	float_unlock();
 	return ret;
 }
 
-int ctf_float_write(struct stream_pos *ppos, struct definition *definition)
+int ctf_float_write(struct bt_stream_pos *ppos, struct bt_definition *definition)
 {
 	struct definition_float *float_definition =
 		container_of(definition, struct definition_float, p);
@@ -222,9 +233,9 @@ int ctf_float_write(struct stream_pos *ppos, struct definition *definition)
 		float_definition->declaration;
 	struct ctf_stream_pos *pos = ctf_pos(ppos);
 	union doubleIEEE754 u;
-	struct definition *tmpdef;
+	struct bt_definition *tmpdef;
 	struct definition_float *tmpfloat;
-	struct ctf_stream_pos srcp;
+	struct ctf_stream_pos srcp = { { 0 } };
 	struct mmap_align mma;
 	int ret;
 
@@ -245,7 +256,7 @@ int ctf_float_write(struct stream_pos *ppos, struct definition *definition)
 		goto end;
 	}
 	tmpfloat = container_of(tmpdef, struct definition_float, p);
-	ctf_init_pos(&srcp, -1, O_RDONLY);
+	ctf_init_pos(&srcp, NULL, -1, O_RDONLY);
 	mmap_align_set_addr(&mma, (char *) u.bits);
 	srcp.base_mma = &mma;
 	srcp.packet_size = sizeof(u) * CHAR_BIT;
@@ -260,32 +271,37 @@ int ctf_float_write(struct stream_pos *ppos, struct definition *definition)
 		ret = -EINVAL;
 		goto end_unref;
 	}
-	ctf_align_pos(pos, float_declaration->p.alignment);
+	if (!ctf_align_pos(pos, float_declaration->p.alignment)) {
+		ret = -EFAULT;
+		goto end_unref;
+	}
 	ret = _ctf_float_copy(ppos, float_definition, &srcp.parent, tmpfloat);
 
 end_unref:
-	definition_unref(tmpdef);
+	bt_definition_unref(tmpdef);
 end:
 	float_unlock();
 	return ret;
 }
 
+static
 void __attribute__((constructor)) ctf_float_init(void)
 {
 	static_float_declaration =
-		float_declaration_new(FLT_MANT_DIG,
+		bt_float_declaration_new(FLT_MANT_DIG,
 				sizeof(float) * CHAR_BIT - FLT_MANT_DIG,
 				BYTE_ORDER,
 				__alignof__(float));
 	static_double_declaration =
-		float_declaration_new(DBL_MANT_DIG,
+		bt_float_declaration_new(DBL_MANT_DIG,
 				sizeof(double) * CHAR_BIT - DBL_MANT_DIG,
 				BYTE_ORDER,
 				__alignof__(double));
 }
 
+static
 void __attribute__((destructor)) ctf_float_fini(void)
 {
-	declaration_unref(&static_float_declaration->p);
-	declaration_unref(&static_double_declaration->p);
+	bt_declaration_unref(&static_float_declaration->p);
+	bt_declaration_unref(&static_double_declaration->p);
 }