[vlc-devel] commit: Modified info_category_AddInfo and added info_category_ReplaceInfo. (Laurent Aimar )

[git version control]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Fri Feb  5 23:06:21 2010 +0100| [2feb065d83c596ee2cf389be6327ed2bf1d814b9] | committer: Laurent Aimar 

Modified info_category_AddInfo and added info_category_ReplaceInfo.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2feb065d83c596ee2cf389be6327ed2bf1d814b9
---

 src/input/info.h |   28 ++++++++++++++++++++++------
 1 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/input/info.h b/src/input/info.h
index bd00e4a..ac0a2bb 100644
--- a/src/input/info.h
+++ b/src/input/info.h
@@ -73,16 +73,19 @@ static inline info_t *info_category_FindInfo(const info_category_t *cat,
 	return NULL;
 }
 
-static inline void info_category_AddInfo(info_category_t *cat, info_t *info)
+static inline void info_category_ReplaceInfo(info_category_t *cat,
+                                             info_t *info)
 {
-	int index;
-	if (info_category_FindInfo(cat, &index, info->psz_name)) {
-		info_Delete(cat->pp_infos[index]);
-		cat->pp_infos[index] = info;
+    int index;
+	info_t *old = info_category_FindInfo(cat, &index, info->psz_name);
+	if (old) {
+        info_Delete(cat->pp_infos[index]);
+        cat->pp_infos[index] = info;
     } else {
-        INSERT_ELEM(cat->pp_infos, cat->i_infos, cat->i_infos, info);
+	    INSERT_ELEM(cat->pp_infos, cat->i_infos, cat->i_infos, info);
     }
 }
+
 static inline info_t *info_category_VaAddInfo(info_category_t *cat,
                                               const char *name,
                                               const char *format, va_list args)
@@ -101,6 +104,19 @@ static inline info_t *info_category_VaAddInfo(info_category_t *cat,
     return info;
 }
 
+static inline info_t *info_category_AddInfo(info_category_t *cat,
+                                            const char *name,
+                                            const char *format, ...)
+{
+    va_list args;
+
+    va_start(args, format);
+    info_t *info = info_category_VaAddInfo(cat, name, format, args);
+    va_end(args);
+
+    return info;
+}
+
 static inline int info_category_DeleteInfo(info_category_t *cat, const char *name)
 {
 	int index;