r4156 - trunk/bse

[timj svn gnome org]

Author: timj
Date: 2006-12-14 17:11:13 -0500 (Thu, 14 Dec 2006)
New Revision: 4156

Modified:
   trunk/bse/ChangeLog
   trunk/bse/gslcommon.c
   trunk/bse/gsldatahandle-vorbis.c
Log:
Thu Dec 14 23:07:16 2006  Tim Janik  <timj gtk org>

        * gslcommon.c (gsl_error_from_errno): special case ENODATA, which is not
        available on GNU/kFreeBSD, reported by Petr Salinger <Petr Salinger seznam cz>.

        * gsldatahandle-vorbis.c (gsl_vorbis1_handle_read): use EIO in unclear
        error cases, because GNU/kFreeBSD lacks ENODATA.




Modified: trunk/bse/ChangeLog
===================================================================
--- trunk/bse/ChangeLog	2006-12-14 21:16:17 UTC (rev 4155)
+++ trunk/bse/ChangeLog	2006-12-14 22:11:13 UTC (rev 4156)
@@ -1,3 +1,11 @@
+Thu Dec 14 23:07:16 2006  Tim Janik  <timj gtk org>
+
+	* gslcommon.c (gsl_error_from_errno): special case ENODATA, which is not
+	available on GNU/kFreeBSD, reported by Petr Salinger <Petr Salinger seznam cz>.
+
+	* gsldatahandle-vorbis.c (gsl_vorbis1_handle_read): use EIO in unclear
+	error cases, because GNU/kFreeBSD lacks ENODATA.
+
 Mon Dec 11 01:13:00 2006  Tim Janik  <timj gtk org>
 
 	* tests/filtertest.cc (generic_filter_tests): added missing stopband

Modified: trunk/bse/gslcommon.c
===================================================================
--- trunk/bse/gslcommon.c	2006-12-14 21:16:17 UTC (rev 4155)
+++ trunk/bse/gslcommon.c	2006-12-14 22:11:13 UTC (rev 4156)
@@ -188,7 +188,10 @@
     case EROFS:
     case EPERM:
     case EACCES:        return BSE_ERROR_PERMS;
-    case ENODATA:       return BSE_ERROR_FILE_EOF;
+#ifdef ENODATA  /* GNU/kFreeBSD lacks this */
+    case ENODATA:
+#endif
+    case ENOMSG:        return BSE_ERROR_FILE_EOF;
     case ENOMEM:	return BSE_ERROR_NO_MEMORY;
     case ENOSPC:	return BSE_ERROR_NO_SPACE;
     case ENFILE:	return BSE_ERROR_NO_FILES;

Modified: trunk/bse/gsldatahandle-vorbis.c
===================================================================
--- trunk/bse/gsldatahandle-vorbis.c	2006-12-14 21:16:17 UTC (rev 4155)
+++ trunk/bse/gsldatahandle-vorbis.c	2006-12-14 22:11:13 UTC (rev 4156)
@@ -526,7 +526,7 @@
         j = gsl_rfile_read (v1h->rfile, blength, buffer);
       while (j < 0 && errno == EINTR);
       if (j <= 0)               /* bail on errors */
-        return errno ? -errno : -ENODATA;
+        return errno ? -errno : -EIO;
       gsl_vorbis_cutter_write_ogg (v1h->vcutter, j, buffer);
     }
 }