[gentoo-commits] proj/ufed:master commit in: /

["Sven Eden" <sven.eden@gmx.de>]

commit:     8d940b199f830d1686a67f5cec88aa6b2c1e8a45
Author:     Sven Eden <yamakuzure <AT> gmx <DOT> net>
AuthorDate: Tue Sep 10 06:17:22 2013 +0000
Commit:     Sven Eden <sven.eden <AT> gmx <DOT> de>
CommitDate: Tue Sep 10 06:17:22 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/ufed.git;a=commit;h=8d940b19

types: Added altenative description to sFlag

---
 ufed-curses-types.c | 8 +++++---
 ufed-curses-types.h | 3 ++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ufed-curses-types.c b/ufed-curses-types.c
index a3bc79e..b604b6d 100644
--- a/ufed-curses-types.c
+++ b/ufed-curses-types.c
@@ -99,10 +99,11 @@ sFlag* addFlag (sFlag** root, const char* name, int line, int ndesc, const char
  *  @param[in,out] flag pointer to the flag to manipulate. Must not be NULL
  *  @param[in] pkg list of affected packages or NULL if no packages are affected
  *  @param[in] desc description line
+ *  @param[in] desc_alt alternative description line
  *  @param[in] state '+','-',' ' for global, installed, forced, masked, package - in that order.
  *  @return the full length of the description including package list and separators
 **/
-size_t addFlagDesc (sFlag* flag, const char* pkg, const char* desc, const char state[7])
+size_t addFlagDesc (sFlag* flag, const char* pkg, const char* desc, const char* desc_alt, const char state[7])
 {
 	size_t result = 3; // space and brackets.
 	if (flag) {
@@ -118,8 +119,9 @@ size_t addFlagDesc (sFlag* flag, const char* pkg, const char* desc, const char s
 			}
 
 			// Now apply.
-			if (pkg)  flag->desc[idx].pkg  = strdup(pkg);
-			if (desc) flag->desc[idx].desc = strdup(desc);
+			if (pkg)      flag->desc[idx].pkg      = strdup(pkg);
+			if (desc)     flag->desc[idx].desc     = strdup(desc);
+			if (desc_alt) flag->desc[idx].desc_alt = strdup(desc_alt);
 			if ('+' == state[0]) flag->desc[idx].isGlobal    = true;
 			if ('+' == state[1]) flag->desc[idx].isInstalled = true;
 			flag->desc[idx].stateForced  = state[2];

diff --git a/ufed-curses-types.h b/ufed-curses-types.h
index af7deec..1fe52d6 100644
--- a/ufed-curses-types.h
+++ b/ufed-curses-types.h
@@ -97,6 +97,7 @@ typedef enum eWin_ {
 **/
 typedef struct sDesc_ {
 	char* desc;         //!< The description line
+	char* desc_alt;     //!< The alternative description line
 	bool  isGlobal;     //!< true if this is the global description and setting
 	bool  isInstalled;  //!< global: at least one pkg is installed, local: all in *pkg are installed.
 	char* pkg;          //!< affected packages
@@ -166,7 +167,7 @@ typedef struct sWindow_ {
  * =======================================
  */
 sFlag* addFlag      (sFlag** root, const char* name, int line, int ndesc, const char state[2]);
-size_t addFlagDesc  (sFlag* flag, const char* pkg, const char* desc, const char state[6]);
+size_t addFlagDesc  (sFlag* flag, const char* pkg, const char* desc, const char* desc_alt, const char state[6]);
 void   addLineStats (const sFlag* flag, sListStats* stats);
 void   destroyFlag  (sFlag** root, sFlag** flag);
 void   genFlagStats (sFlag* flag);