[giFTcurs-commits] giFTcurs/src format.c giftcurs.h screen.c setti...

[Christian Häggström]

CVSROOT:        /cvsroot/giftcurs
Module name:    giFTcurs
Branch:         
Changes by:     Christian Häggström <address@hidden>    03/09/08 13:52:07

Modified files:
        src            : format.c giftcurs.h screen.c settings.c 

Log message:
        indent preprocessor directives, fix typos

Patches:
Index: giFTcurs/src/format.c
diff -u giFTcurs/src/format.c:1.66 giFTcurs/src/format.c:1.67
--- giFTcurs/src/format.c:1.66  Fri Aug 29 17:49:05 2003
+++ giFTcurs/src/format.c       Mon Sep  8 13:52:06 2003
@@ -18,7 +18,7 @@
  * along with giFTcurs; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307,  USA.
  *
- * $Id: format.c,v 1.66 2003/08/29 21:49:05 weinholt Exp $
+ * $Id: format.c,v 1.67 2003/09/08 17:52:06 saturn Exp $
  */
 #include "giftcurs.h"
 
@@ -491,7 +491,7 @@
        int progress_on = 0;
        int fixed_on = 0;
 
-       /* temporary space for saved variables (when inside {fixed} {endfixed} 
*/
+       /* temporary space for saved variables (when inside {fixed} {endfixed}) 
*/
        format_t o_endif = NULL, o_pending = NULL;
        int o_progress_on = 0;
 
Index: giFTcurs/src/giftcurs.h
diff -u giFTcurs/src/giftcurs.h:1.61 giFTcurs/src/giftcurs.h:1.62
--- giFTcurs/src/giftcurs.h:1.61        Sat Aug 23 16:01:44 2003
+++ giFTcurs/src/giftcurs.h     Mon Sep  8 13:52:06 2003
@@ -18,7 +18,7 @@
  * along with giFTcurs; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307,  USA.
  *
- * $Id: giftcurs.h,v 1.61 2003/08/23 20:01:44 weinholt Exp $
+ * $Id: giftcurs.h,v 1.62 2003/09/08 17:52:06 saturn Exp $
  */
 #ifndef _GIFTCURS_H
 #define _GIFTCURS_H
@@ -69,13 +69,6 @@
 
 typedef int (*CmpFunc) (const void *, const void *);
 
-#ifndef __USE_GNU
-# define __USE_GNU
-#endif
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE
-#endif
-
 #ifdef G_HAVE_ISO_VARARGS
 # define DEBUG(...)                            g_log(G_LOG_DOMAIN, 
G_LOG_LEVEL_DEBUG, __VA_ARGS__)
 #elif defined(G_HAVE_GNUC_VARARGS)
@@ -86,10 +79,10 @@
 
 /* These two are not present in glib 2.0 */
 #ifndef G_UNLIKELY
-#define G_UNLIKELY(x) (x)
+# define G_UNLIKELY(x) (x)
 #endif
 #ifndef G_LIKELY
-#define G_LIKELY(x) (x)
+# define G_LIKELY(x) (x)
 #endif
 
 #endif
Index: giFTcurs/src/screen.c
diff -u giFTcurs/src/screen.c:1.112 giFTcurs/src/screen.c:1.113
--- giFTcurs/src/screen.c:1.112 Tue Jul 22 20:26:25 2003
+++ giFTcurs/src/screen.c       Mon Sep  8 13:52:06 2003
@@ -18,7 +18,7 @@
  * along with giFTcurs; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307,  USA.
  *
- * $Id: screen.c,v 1.112 2003/07/23 00:26:25 weinholt Exp $
+ * $Id: screen.c,v 1.113 2003/09/08 17:52:06 saturn Exp $
  */
 #include "giftcurs.h"
 
@@ -197,11 +197,11 @@
        struct winsize size;
 
        if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &size) == 0) {
-#if HAVE_RESIZE_TERM
+# if HAVE_RESIZE_TERM
                resize_term(size.ws_row, size.ws_col);
-# else
+#  else
                resizeterm(size.ws_row, size.ws_col);
-#endif
+# endif
                getmaxyx(stdscr, max_y, max_x);
                wrefresh(curscr);               /* Linux needs this */
                ui_draw();
Index: giFTcurs/src/settings.c
diff -u giFTcurs/src/settings.c:1.41 giFTcurs/src/settings.c:1.42
--- giFTcurs/src/settings.c:1.41        Wed Aug 20 15:47:37 2003
+++ giFTcurs/src/settings.c     Mon Sep  8 13:52:06 2003
@@ -18,7 +18,7 @@
  * along with giFTcurs; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307,  USA.
  *
- * $Id: settings.c,v 1.41 2003/08/20 19:47:37 weinholt Exp $
+ * $Id: settings.c,v 1.42 2003/09/08 17:52:06 saturn Exp $
  */
 #include "giftcurs.h"
 
@@ -170,7 +170,7 @@
                while (fgets(line, sizeof line, in)) {
                        setting *fnord = NULL;
 
-                       strncpy(copy, line, sizeof copy);
+                       g_strlcpy(copy, line, sizeof copy);
 
                        if (!parse_configuration_line(line, &section, &name, 
&value)) {
                                fputs(copy, out);