Merge branch 'maint'
authorAndre Noll <maan@tuebingen.mpg.de>
Thu, 22 Jan 2015 17:45:38 +0000 (18:45 +0100)
committerAndre Noll <maan@tuebingen.mpg.de>
Thu, 22 Jan 2015 17:45:38 +0000 (18:45 +0100)
Was cooking for a week and seems to be regression-free.

aft: Generate a remove event when adding duplicate files.
command.c: Add missing items to EMPTY_STATUS_ITEMS.
aft.c: Don't call osl_close_disk_object() on failure.
Add missing osl() wrapper calls.
fd.c: Add missing va_end().

The conflict in aft.c was trivial to fix up.

1  2 
aft.c
blob.c
command.c
fd.c

diff --cc aft.c
--- 1/aft.c
--- 2/aft.c
+++ b/aft.c
@@@ -1105,11 -1106,12 +1105,11 @@@ int open_and_update_audio_file(struct o
        if (ret < 0)
                return ret;
        afd->afhi.chunk_table = NULL;
-       ret = osl_open_disk_object(audio_file_table, aft_row,
-               AFTCOL_CHUNKS, &chunk_table_obj);
+       ret = osl(osl_open_disk_object(audio_file_table, aft_row,
+               AFTCOL_CHUNKS, &chunk_table_obj));
        if (ret < 0)
-               goto err;
+               return ret;
 -      ret = mmap_full_file(path, O_RDONLY, &map.data,
 -              &map.size, &afd->fd);
 +      ret = mmap_full_file(path, O_RDONLY, &map.data, &map.size, &afd->fd);
        if (ret < 0)
                goto err;
        hash_function(map.data, map.size, file_hash);
diff --cc blob.c
Simple merge
diff --cc command.c
+++ b/command.c
@@@ -416,9 -434,12 +416,10 @@@ static int com_version(struct command_c
        if (cc->argc != 1)
                return -E_COMMAND_SYNTAX;
        len = xasprintf(&msg, "%s", version_text("server"));
 -      if (cc->use_sideband)
 -              return send_sb(&cc->scc, msg, len, SBD_OUTPUT, false);
 -      return sc_send_bin_buffer(&cc->scc, msg, len);
 +      return send_sb(&cc->scc, msg, len, SBD_OUTPUT, false);
  }
  
+ /** These status items are cleared if no audio file is currently open. */
  #define EMPTY_STATUS_ITEMS \
        ITEM(PATH) \
        ITEM(DIRECTORY) \
diff --cc fd.c
Simple merge