Merge branch 'maint'

Two fixes that have been cooking in for-maint for a while.

* maint:
  i9e: Restore file status flags on exit.
  NEWS,md: Add introductory text for v0.5.7.

diff --git a/NEWS.md b/NEWS.md
index 6cb098c56adae3ce61ca39ce8b73d2a81ef6c7c4..2056f90c06716f40f67fa43d477e63787e780ddb 100644 (file)
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,9 +1,9 @@
 NEWS
 ====
 
-------------------------------------------
-0.5.7 (to be announced) "semantic density"
-------------------------------------------
+-------------------------------------
+0.5.7 (2016-12-31) "semantic density"
+-------------------------------------
 
 Mostly a bug fix release, and a bunch of internal improvements.
 The only user-visible changes are the sanity checks for the touch
@@ -24,7 +24,9 @@ command and the new options to the ls command.
 - New section on contributing for the user manual.
 - Major simplification of the error subsystem.
 
-Download: [tarball](./releases/paraslash-git.tar.bz2)
+Downloads:
+[tarball](./releases/paraslash-0.5.7.tar.bz2),
+[signature](./releases/paraslash-0.5.7.tar.bz2.asc)
 
 -------------------------------------------
 0.4.14 (2016-12-31) "branching oscillation"

diff --git a/afh.h b/afh.h
index a6f9c50073bd39563d05a76f38c5377b10451b16..801c168c0ca1dc578745e9af87c60028a9774827 100644 (file)
--- a/afh.h
+++ b/afh.h
@@ -101,7 +101,7 @@ struct audio_format_handler {
         * \sa struct afh_info
         */
        int (*get_file_info)(char *map, size_t numbytes, int fd,
-               struct afh_info *afi);
+               struct afh_info *afhi);
        /** Optional, used for header-rewriting. See \ref afh_get_header(). */
        void (*get_header)(void *map, size_t mapsize, char **buf, size_t *len);
        /**

diff --git a/ogg_afh_common.c b/ogg_afh_common.c
index adab7f481fbb0e7873c1d1e1ac4968834bd81fe3..6e5a89347e383340f943e591254f64f05cc6f358 100644 (file)
--- a/ogg_afh_common.c
+++ b/ogg_afh_common.c
@@ -127,19 +127,18 @@ int ogg_get_file_info(char *map, size_t numbytes, struct afh_info *afhi,
 {
        ogg_sync_state oss;
        ogg_page op;
-       long len = numbytes;
        char *buf;
        int ret, i, j, frames_per_chunk, ct_size;
        long long unsigned num_frames = 0;
 
        ogg_sync_init(&oss);
        ret = -E_OGG_SYNC;
-       buf = ogg_sync_buffer(&oss, len);
+       buf = ogg_sync_buffer(&oss, numbytes);
        if (!buf)
                goto out;
-       memcpy(buf, map, len);
+       memcpy(buf, map, numbytes);
        ret = -E_OGG_SYNC;
-       if (ogg_sync_wrote(&oss, len) < 0)
+       if (ogg_sync_wrote(&oss, numbytes) < 0)
                goto out;
        ret = process_ogg_packets(&oss, afhi, ci);
        if (ret < 0)