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

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

commit:     9d9098764e8d6f52ed506d500c061bb9878a62c8
Author:     Sven Eden <sven.eden <AT> gmx <DOT> de>
AuthorDate: Fri Feb  1 15:27:43 2013 +0000
Commit:     Sven Eden <sven.eden <AT> gmx <DOT> de>
CommitDate: Fri Feb  1 15:27:43 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/ufed.git;a=commit;h=9d909876

Added a post-load analyzation to make use flags, that have only local descriptions which are all masked and/or forced unchangeable.

---
 ufed-curses-checklist.c |    3 ++-
 ufed-curses-types.c     |   44 ++++++++++++++++++++++++++++++++++++++++++++
 ufed-curses-types.h     |    1 +
 3 files changed, 47 insertions(+), 1 deletions(-)

diff --git a/ufed-curses-checklist.c b/ufed-curses-checklist.c
index c8ccd65..c28a824 100644
--- a/ufed-curses-checklist.c
+++ b/ufed-curses-checklist.c
@@ -169,7 +169,8 @@ static void read_flags(void)
 			++lineNum;
 		} // loop through description lines
 
-		// Add line data to the list stats
+		// Update flag states and add data to the list stats
+		genFlagStats(newFlag);
 		addLineStats(newFlag, &listStats);
 	} // loop while input given
 

diff --git a/ufed-curses-types.c b/ufed-curses-types.c
index 7b208fa..c80b9dd 100644
--- a/ufed-curses-types.c
+++ b/ufed-curses-types.c
@@ -224,6 +224,50 @@ void destroyFlag (sFlag** root, sFlag** flag)
 }
 
 
+/** @brief generate globalMasked and globalForced
+ * This function checks whether either the first global description,
+ * or all local descriptions with no available global description of
+ * a flag is/are masked and/or forced and sets the global states
+ * accordingly.
+ * @param[in,out] flag pointer to the flag to check
+ */
+void genFlagStats (sFlag* flag)
+{
+	if (flag) {
+		bool hasLocal       = false;
+		bool hasGlobal      = false;
+		bool allLocalMasked = true;
+		bool allLocalForced = true;
+		for (int i = 0;
+			(!hasGlobal || allLocalMasked || allLocalForced)
+				&& (i < flag->ndesc)
+			; ++i) {
+			if (flag->desc[i].isGlobal) {
+				hasGlobal = true;
+				if ('+' == flag->desc[i].stateForced)
+					flag->globalForced = true;
+				if ('+' == flag->desc[i].stateMasked)
+					flag->globalMasked = true;
+			} else {
+				hasLocal = true;
+				if ('+' != flag->desc[i].stateForced)
+					allLocalForced = false;
+				if ('+' != flag->desc[i].stateMasked)
+					allLocalMasked = false;
+			}
+		}
+
+		// Now if there is no global description,
+		// the "global" settings are taken from the
+		// local ones.
+		if (!hasGlobal && hasLocal) {
+			flag->globalForced = allLocalForced;
+			flag->globalMasked = allLocalMasked;
+		}
+	}
+}
+
+
 /** @brief determine the number of lines used by @a flag
  *  This method checks the flag and its description line(s)
  *  settings against the globally active filters.

diff --git a/ufed-curses-types.h b/ufed-curses-types.h
index cb02e85..4c55532 100644
--- a/ufed-curses-types.h
+++ b/ufed-curses-types.h
@@ -166,6 +166,7 @@ sFlag* addFlag      (sFlag** root, const char* name, int line, int ndesc, const
 size_t addFlagDesc  (sFlag* flag, const char* pkg, const char* desc, const char state[5]);
 void   addLineStats (const sFlag* flag, sListStats* stats);
 void   destroyFlag  (sFlag** root, sFlag** flag);
+void   genFlagStats (sFlag* flag);
 int    getFlagHeight(const sFlag* flag);
 bool   isDescForced (const sFlag* flag, int idx);
 bool   isDescLegal  (const sFlag* flag, int idx);