[ncview] 16/31: Imported Upstream version 2.1.4

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository ncview.

commit ceb875eb41cd2b0990e8cbef95ee6142f3c81d0c
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Apr 18 01:40:41 2015 +0200

    Imported Upstream version 2.1.4
---
 src/interface/display_info.c | 2 +-
 src/interface/plot_xy.c      | 2 +-
 src/ncview.c                 | 8 ++++----
 src/ncview.defines.h         | 4 ++--
 src/utCalendar2_cal.c        | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/interface/display_info.c b/src/interface/display_info.c
index 38fde2e..b038fba 100644
--- a/src/interface/display_info.c
+++ b/src/interface/display_info.c
@@ -122,7 +122,7 @@ display_close_callback(Widget widget, XtPointer client_data, XtPointer call_data
 	int	i;
 
 	i = 0;
-	while( (display_close_button_widget[i] != widget) && (i < MAX_DISPLAY_POPUPS) )
+	while( (i < MAX_DISPLAY_POPUPS) && (display_close_button_widget[i] != widget))
 		i++;
 	if( i == MAX_DISPLAY_POPUPS ) {
 		fprintf( stderr, "Internal error!  Can't find widget to close display popup!\n" );
diff --git a/src/interface/plot_xy.c b/src/interface/plot_xy.c
index 292d0dc..f147d86 100644
--- a/src/interface/plot_xy.c
+++ b/src/interface/plot_xy.c
@@ -424,7 +424,7 @@ plot_XY_locked_callback(Widget widget, XtPointer client_data, XtPointer call_dat
 	int	i, j;
 
 	i = 0;
-	while( (plot_locked_button_widget[i] != widget) && (i < MAX_PLOT_XY) )
+	while((i < MAX_PLOT_XY) && (plot_locked_button_widget[i] != widget))
 		i++;
 	if( i == MAX_PLOT_XY ) {
 		fprintf( stderr, "Internal error!  Can't find widget to change lock on!\n" );
diff --git a/src/ncview.c b/src/ncview.c
index a4127c2..45e1522 100644
--- a/src/ncview.c
+++ b/src/ncview.c
@@ -1,6 +1,6 @@
 /*
  * Ncview by David W. Pierce.  A visual netCDF file viewer.
- * Copyright (C) 1993 through 2013 David W. Pierce
+ * Copyright (C) 1993 through 2014 David W. Pierce
  *
  * This program  is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, Version 3, as 
@@ -816,7 +816,7 @@ print_disclaimer()
 {
 fprintf( stderr, "%s\n", PROGRAM_ID );
 fprintf( stderr, "http://meteora.ucsd.edu:80/~pierce/ncview_home_page.html\n" );
-fprintf( stderr, "Copyright (C) 1993 through 2013, David W. Pierce\n" );
+fprintf( stderr, "Copyright (C) 1993 through 2014, David W. Pierce\n" );
 fprintf( stderr, "Ncview comes with ABSOLUTELY NO WARRANTY; for details type `ncview -w'.\n" );
 fprintf( stderr, "This is free software licensed under the Gnu General Public License version 3; type `ncview -c' for redistribution details.\n\n" );
 }
@@ -825,7 +825,7 @@ fprintf( stderr, "This is free software licensed under the Gnu General Public Li
 	void
 print_no_warranty()
 {
-printf( "\n The program `ncview' is Copyright (C) 1993 through 2013 David W. Pierce, and\n" );
+printf( "\n The program `ncview' is Copyright (C) 1993 through 2014 David W. Pierce, and\n" );
 printf( "is subject to the terms and conditions of the Gnu General Public License,\n" );
 printf( "Version 3. For information on copying, modifying, or distributing `ncview',\n" );
 printf( "type `ncview -c'.\n" );
@@ -865,7 +865,7 @@ printf( "POSSIBILITY OF SUCH DAMAGES.\n" );
 	void 
 print_copying()
 {
-printf( "  The program `ncview' is Copyright (C) 1993 through 2013, David W. Pierce, and \n" );
+printf( "  The program `ncview' is Copyright (C) 1993 through 2014, David W. Pierce, and \n" );
 printf( "is subject to the terms and conditions of the Gnu General Public License,\n" );
 printf( "Version 3.  Ncview comes with NO WARRANTY; for further information, type\n" );
 printf( "`ncview -w'.\n" );
diff --git a/src/ncview.defines.h b/src/ncview.defines.h
index 82ac1f4..695fe2a 100644
--- a/src/ncview.defines.h
+++ b/src/ncview.defines.h
@@ -31,8 +31,8 @@
 #include <udunits2.h>
 #endif
 
-#define PROGRAM_ID		"Ncview 2.1.3 David W. Pierce  1 Sept 2013"
-#define PROGRAM_VERSION_STRING	"2.1.3"
+#define PROGRAM_ID		"Ncview 2.1.4 David W. Pierce  13 Nov 2014"
+#define PROGRAM_VERSION_STRING	"2.1.4"
 #define APP_RES_VERSION 	1.93
 
 #ifndef TRUE
diff --git a/src/utCalendar2_cal.c b/src/utCalendar2_cal.c
index ae59e51..5427369 100644
--- a/src/utCalendar2_cal.c
+++ b/src/utCalendar2_cal.c
@@ -691,7 +691,7 @@ static int inferred_origin_year( const char *s )
 /* printf( "loc that string 'since' starts: %d\n", loc_since_start ); */
 
 	ifnbss = loc_since_start + 5;	/* ifnbss = "i first non blank since since" */
-	while( isblank( *(s+ifnbss) ) && (*(s+ifnbss) != '\0') && (ifnbss < sl))
+	while( (ifnbss < sl) && isblank( *(s+ifnbss) ) && (*(s+ifnbss) != '\0'))
 		ifnbss++;
 
 /* printf( "i first non blank since since:%d\n", ifnbss ); */

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/ncview.git