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

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

commit:     0ef8034aa3e04a03d2b9af59d423d6990b61f8ac
Author:     Sven Eden <sven.eden <AT> gmx <DOT> de>
AuthorDate: Mon Jan 21 08:52:57 2013 +0000
Commit:     Sven Eden <sven.eden <AT> gmx <DOT> de>
CommitDate: Mon Jan 21 08:52:57 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/ufed.git;a=commit;h=0ef8034a

Cleaned up some prototypes and external references. This is a preapration for later development.

---
 ufed-curses-checklist.c |    2 +-
 ufed-curses-help.c      |    2 ++
 ufed-curses.h           |   24 +++++++++++++-----------
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/ufed-curses-checklist.c b/ufed-curses-checklist.c
index a4f65b8..11de724 100644
--- a/ufed-curses-checklist.c
+++ b/ufed-curses-checklist.c
@@ -56,7 +56,7 @@ enum mask  showMasked = show_unmasked; //!< Set whether to show masked, unmasked
 enum order pkgOrder   = pkgs_left;     //!< Set whether to display package lists left or right of the description
 enum scope showScope  = show_all;      //!< Set whether global, local or all flags are shown
 int firstNormalY      = -1;            //!< y of first not masked flag
-
+extern int topy, minwidth;
 
 /* static functions */
 static char *getline(FILE *fp) {

diff --git a/ufed-curses-help.c b/ufed-curses-help.c
index c967ff6..fff79f5 100644
--- a/ufed-curses-help.c
+++ b/ufed-curses-help.c
@@ -11,6 +11,8 @@
 #include <strings.h>
 #include <unistd.h>
 
+extern int topy;
+
 static struct line {
 	struct item item;
 	char *text;

diff --git a/ufed-curses.h b/ufed-curses.h
index 7a1ca4d..9633692 100644
--- a/ufed-curses.h
+++ b/ufed-curses.h
@@ -5,6 +5,7 @@
 #include <curses.h>
 
 
+/* debugging macros */
 #define DEBUG_EXIT 1
 #undef DEBUG_TRACE
 
@@ -27,6 +28,7 @@
 #endif // DEBUG_TRACE
 
 
+/* global types */
 enum win { Top, Left, List, Input, Scrollbar, Right, Bottom, wCount };
 enum mask { show_unmasked, show_both, show_masked };
 enum order { pkgs_left, pkgs_right };
@@ -50,22 +52,25 @@ struct key {
 	size_t length;
 };
 
-extern struct window window[wCount];
 
-extern void initcurses(void);
-extern void cursesdone(void);
+/* global prototypes */
+void cursesdone(void);
+void initcurses(void);
+bool isLegalItem(struct item *item);
 
-extern int maineventloop(
+int maineventloop(
 	const char *subtitle,
 	int (*callback)(struct item **currentitem, int key),
 	int (*drawitem)(struct item *item, bool highlight),
 	struct item *items,
 	const struct key *keys);
-extern void drawitems(void);
-extern void scrollcurrent(void);
-extern bool yesno(const char *);
-bool isLegalItem(struct item *item);
+void drawitems(void);
+void scrollcurrent(void);
+bool yesno(const char *);
 
+
+/* global inline functions */
+extern struct window window[wCount];
 static inline WINDOW *win(enum win w) { return window[w].win; }
 static inline int wTop   (enum win w) { return (window[w].top   >= 0 ? 0 : LINES) + window[w].top   ; }
 static inline int wLeft  (enum win w) { return (window[w].left  >= 0 ? 0 : COLS ) + window[w].left  ; }
@@ -73,6 +78,3 @@ static inline int wHeight(enum win w) { return (window[w].height > 0 ? 0 : LINES
 static inline int wWidth (enum win w) { return (window[w].width  > 0 ? 0 : COLS ) + window[w].width ; }
 static inline int min(int a, int b) { return a < b ? a : b; }
 static inline int max(int a, int b) { return a > b ? a : b; }
-
-extern int minwidth;
-extern int topy;