Update of /cvsroot/ufraw/ufraw
In directory vz-cvs-3.sog:/tmp/cvs-serv17639
Modified Files:
ufraw_conf.c ufraw_routines.c
Log Message:
Oops. Here is the correct version of the GCC 4.6 compiler warning fixes.
Index: ufraw_routines.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_routines.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- ufraw_routines.c 3 Sep 2011 08:05:44 -0000 1.116
+++ ufraw_routines.c 3 Sep 2011 09:30:11 -0000 1.117
@@ -409,7 +409,9 @@
locale = uf_set_locale_C();
context = g_markup_parse_context_new(&parser, 0, cp, NULL);
line[max_path-1] = '\0';
- if (fgets(line, max_path - 1, in) == NULL) {
+ if (fgets(line, max_path - 1, in) == NULL && !feof(in)) {
+// ufraw_message(UFRAW_ERROR, _("Error reading from file '%s'\n"),
+// filename);
fclose(in);
return UFRAW_ERROR;
}
@@ -424,7 +426,9 @@
g_error_free(err);
return UFRAW_ERROR;
}
- if (fgets(line, max_path, in) == NULL) {
+ if (fgets(line, max_path, in) == NULL && !feof(in)) {
+// ufraw_message(UFRAW_ERROR, _("Error reading from file
'%s'\n"),
+// filename);
fclose(in);
return UFRAW_ERROR;
}
Index: ufraw_conf.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_conf.c,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -d -r1.178 -r1.179
--- ufraw_conf.c 3 Sep 2011 08:05:44 -0000 1.178
+++ ufraw_conf.c 3 Sep 2011 09:30:11 -0000 1.179
@@ -816,7 +816,10 @@
user_data.ufrawQuark = g_quark_from_static_string("UFRaw");
context = g_markup_parse_context_new(&parser, 0, &user_data, NULL);
line[max_path-1] = '\0';
- if (fgets(line, max_path - 1, in) == NULL) {
+ if (fgets(line, max_path - 1, in) == NULL && !feof(in)) {
+// ufraw_message(UFRAW_ERROR, _("Error reading from file '%s'\n"),
+// confFilename);
+ g_free(confFilename);
fclose(in);
return UFRAW_ERROR;
}
@@ -834,7 +837,10 @@
g_error_free(err);
return UFRAW_ERROR;
}
- if (fgets(line, max_path, in) == NULL) {
+ if (fgets(line, max_path, in) == NULL && !feof(in)) {
+// ufraw_message(UFRAW_ERROR, _("Error reading from file '%s'\n"),
+// confFilename);
+ g_free(confFilename);
fclose(in);
return UFRAW_ERROR;
}
------------------------------------------------------------------------------
Special Offer -- Download ArcSight Logger for FREE!
Finally, a world-class log management solution at an even better
price-free! And you'll get a free "Love Thy Logs" t-shirt when you
download Logger. Secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsisghtdev2dev
_______________________________________________
ufraw-cvs mailing list
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
