aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2010-01-08 13:55:55 +0100
committerThomas White <taw@physics.org>2010-01-08 13:56:09 +0100
commit9f9b025f888e2d635f4211bf7dcfc79b98a214e0 (patch)
tree863b33d2b50d71848cfed188fb7750639502826f
parent20a4ae775b80f6b425a95727b08efb4c3e3226ba (diff)
Small fixes
-rw-r--r--src/displaywindow.c10
-rw-r--r--src/indexamajig.c1
2 files changed, 6 insertions, 5 deletions
diff --git a/src/displaywindow.c b/src/displaywindow.c
index 4d45fbc2..49c094ec 100644
--- a/src/displaywindow.c
+++ b/src/displaywindow.c
@@ -31,7 +31,7 @@
#define INITIAL_BINNING 2
-void displaywindow_error(DisplayWindow *dw, const char *message)
+static void displaywindow_error(DisplayWindow *dw, const char *message)
{
GtkWidget *window;
@@ -46,7 +46,7 @@ void displaywindow_error(DisplayWindow *dw, const char *message)
}
-void displaywindow_update(DisplayWindow *dw)
+static void displaywindow_update(DisplayWindow *dw)
{
gint width;
GdkGeometry geom;
@@ -155,7 +155,7 @@ static gint displaywindow_set_binning_response(GtkWidget *widget, gint response,
if ( response == GTK_RESPONSE_OK ) {
const char *sbinning;
- int binning;
+ unsigned int binning;
int scanval;
sbinning = gtk_entry_get_text(
@@ -293,7 +293,7 @@ static gint displaywindow_set_boostint_response(GtkWidget *widget,
if ( response == GTK_RESPONSE_OK ) {
const char *sboostint;
- int boostint;
+ unsigned int boostint;
int scanval;
sboostint = gtk_entry_get_text(
@@ -417,7 +417,7 @@ static gint displaywindow_about(GtkWidget *widget, DisplayWindow *dw)
gtk_about_dialog_set_name(GTK_ABOUT_DIALOG(window), "hdfsee");
gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(window), PACKAGE_VERSION);
gtk_about_dialog_set_copyright(GTK_ABOUT_DIALOG(window),
- "(c) 2006-2009 Thomas White <taw@physics.org> and others");
+ "(c) 2006-2010 Thomas White <taw@physics.org> and others");
gtk_about_dialog_set_comments(GTK_ABOUT_DIALOG(window),
"Quick viewer for HDF files");
gtk_about_dialog_set_license(GTK_ABOUT_DIALOG(window),
diff --git a/src/indexamajig.c b/src/indexamajig.c
index 69813118..76ed6ed6 100644
--- a/src/indexamajig.c
+++ b/src/indexamajig.c
@@ -248,6 +248,7 @@ int main(int argc, char *argv[])
int fom;
rval = fgets(line, 1023, fh);
+ if ( rval == NULL ) continue;
chomp(line);
STATUS("Processing '%s'\n", line);