X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Ftypes.h;h=00c928b57baf6d97bc0ed8e06e4e4e4ddf11c9b2;hp=cfc74a2f6206c72cfb3805bf139b81dbd0dba719;hb=9e3274b092343c999fcde33854d2df37b3702496;hpb=8673030f3cb8d157a30e79af524fd5cca253025e

diff --git a/include/babeltrace/types.h b/include/babeltrace/types.h
index cfc74a2f..00c928b5 100644
--- a/include/babeltrace/types.h
+++ b/include/babeltrace/types.h
@@ -19,6 +19,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/align.h>
@@ -34,7 +42,7 @@
 /* Preallocate this many fields for structures */
 #define DEFAULT_NR_STRUCT_FIELDS 8
 
-struct ctf_stream;
+struct ctf_stream_definition;
 struct stream_pos;
 struct format;
 struct definition;
@@ -106,7 +114,7 @@ struct stream_pos {
 	/* read/write dispatch table. Specific to plugin used for stream. */
 	rw_dispatch *rw_table;	/* rw dispatch table */
 	int (*event_cb)(struct stream_pos *pos,
-			struct ctf_stream *stream);
+			struct ctf_stream_definition *stream);
 };
 
 static inline
@@ -371,6 +379,7 @@ int64_t get_signed_int(const struct definition *field);
 int get_int_signedness(const struct definition *field);
 int get_int_byte_order(const struct definition *field);
 int get_int_base(const struct definition *field);
+size_t get_int_len(const struct definition *field);	/* in bits */
 enum ctf_string_encoding get_int_encoding(const struct definition *field);
 
 /*
@@ -507,15 +516,24 @@ void append_scope_path(const char *path, GArray *q);
 /*
  * Lookup helpers.
  */
-struct definition *lookup_definition(struct definition *definition,
+struct definition *lookup_definition(const struct definition *definition,
 				     const char *field_name);
-struct definition_integer *lookup_integer(struct definition *definition,
+struct definition_integer *lookup_integer(const struct definition *definition,
 					  const char *field_name,
 					  int signedness);
-struct definition_enum *lookup_enum(struct definition *definition,
+struct definition_enum *bt_lookup_enum(const struct definition *definition,
 				    const char *field_name,
 				    int signedness);
-struct definition *lookup_variant(struct definition *definition,
+struct definition *lookup_variant(const struct definition *definition,
 				  const char *field_name);
 
+static inline
+const char *rem_(const char *str)
+{
+	if (str[0] == '_')
+		return &str[1];
+	else
+		return str;
+}
+
 #endif /* _BABELTRACE_TYPES_H */