From: Andre Noll <maan@tuebingen.mpg.de>
Date: Thu, 22 Jan 2015 17:45:38 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: v0.5.4~3
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=f167629b3191c57a6b691cd2a6af04a45a74ccb0

Merge branch 'maint'

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.
---

f167629b3191c57a6b691cd2a6af04a45a74ccb0
diff --cc aft.c
index c61d3820,301da7c7..727292c7
--- a/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 command.c
index 43f85ca6,2e733c5c..2ef9c5a8
--- a/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) \