Merge branch 'js/rebase-cleanup'

diff --git a/trace2/tr2_tbuf.h b/trace2/tr2_tbuf.h
index 9cdefa395749f02286c4f821d51bf78c6c06d181..fa853d8f4211b5c34ec592308cf028e3dbd0b406 100644 (file)
--- a/trace2/tr2_tbuf.h
+++ b/trace2/tr2_tbuf.h
@@ -16,8 +16,9 @@ struct tr2_tbuf {
 void tr2_tbuf_local_time(struct tr2_tbuf *tb);
 
 /*
- * Fill buffer with formatted UTC time string.
+ * Fill buffer with formatted UTC datatime string.
  */
-void tr2_tbuf_utc_time(struct tr2_tbuf *tb);
+void tr2_tbuf_utc_datetime_extended(struct tr2_tbuf *tb);
+void tr2_tbuf_utc_datetime(struct tr2_tbuf *tb);
 
 #endif /* TR2_TBUF_H */