Spruced up the TODOs a bit, got rid of some of them since a lot of it was

duplicate anyway. Also removed the last of the ORE tags and replaced them
with TODOs.

2 files changed, 13 insertions, 16 deletions

diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c
index 6465b12b..0d7246d0 100644
--- a/lib/libalpm/alpm.c
+++ b/lib/libalpm/alpm.c
@@ -820,19 +820,17 @@ int SYMEXPORT alpm_logaction(char *fmt, ...)
 	vsnprintf(str, LOG_STR_LEN, fmt, args);
 	va_end(args);
 
-	/* ORE
-	We should add a prefix to log strings depending on who called us.
-	If logaction was called by the frontend:
-		USER: <the frontend log>
-	and if called internally:
-		ALPM: <the library log>
-	Moreover, the frontend should be able to choose its prefix (USER by default?):
-		pacman: "PACMAN"
-		kpacman: "KPACMAN"
-		...
-	It allows to share the log file between several frontends and to actually 
-	know who does what */
-
+	/* TODO	We should add a prefix to log strings depending on who called us.
+	 * If logaction was called by the frontend:
+	 *   USER: <the frontend log>
+	 * and if called internally:
+	 *   ALPM: <the library log>
+	 * Moreover, the frontend should be able to choose its prefix
+	 * (USER by default?):
+	 *   pacman: "PACMAN"
+	 *   kpacman: "KPACMAN"
+	 * This would allow us to share the log file between several frontends
+	 * and know who does what */ 
 	return(_alpm_logaction(handle->usesyslog, handle->logfd, str));
 }
 /** @} */
diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c
index 4de86523..d162da09 100644
--- a/lib/libalpm/be_files.c
+++ b/lib/libalpm/be_files.c
@@ -53,9 +53,8 @@ int _alpm_db_install(pmdb_t *db, const char *dbfile)
 {
 	ALPM_LOG_FUNC;
 
-	/* ORE
-		 we should not simply unpack the archive, but better parse it and 
-		 db_write each entry (see sync_load_dbarchive to get archive content) */
+	/* TODO we should not simply unpack the archive, but better parse it and 
+	 * db_write each entry (see sync_load_dbarchive to get archive content) */
 	_alpm_log(PM_LOG_DEBUG, _("unpacking database '%s'"), dbfile);
 
 	if(_alpm_unpack(dbfile, db->path, NULL)) {