From: Andre Noll
Date: Sun, 29 Sep 2013 10:59:04 +0000 (+0200)
Subject: Merge branch 't/misc_cleanups'
X-Git-Tag: v0.5.1~12
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=74145aabe851ba5b7eff47b650f401f49b5c740d;hp=3f97ae6c928596a15fc4e7e0b0fbf754347165f8
Merge branch 't/misc_cleanups'
Was cooking since 2013-08-04.
3f97ae buffer_tree: Improve documentation of btr_no_parent().
fb9209 Avoid gcc warning on FreeBSD.
778af7 command.c: Avoid declaration after statement.
61c957 extract_v4_addr(): Don't return a structure.
1d7937 command.c: Remove pointless initialization.
c17ede crypt.c: Remove condition which is always true.
a12ecb ipc: Close proc fd.
01d37b Make log functions static.
0ba631 score: Improve documentation of score_update().
d6cf71 GIT-VERSION-GEN: Don't include output of git update-index.
---
diff --git a/amp_filter.c b/amp_filter.c
index f62ea8a2..dddc0a85 100644
--- a/amp_filter.c
+++ b/amp_filter.c
@@ -58,7 +58,7 @@ static void amp_open(struct filter_node *fn)
sscanf(stat_item_values[SI_AMPLIFICATION], "%u", &pad->amp);
else
pad->amp = conf->amp_arg;
- PARA_NOTICE_LOG("amplification: %u (scaling factor: %1.2f)\n",
+ PARA_INFO_LOG("amplification: %u (scaling factor: %1.2f)\n",
pad->amp, pad->amp / 64.0 + 1.0);
}
diff --git a/bash_completion b/bash_completion
index 51bbc68e..d35247eb 100644
--- a/bash_completion
+++ b/bash_completion
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011 Andre Noll
+# Copyright (C) 2007-2013 Andre Noll
#
# Licensed under the GPL v2. For licencing details see COPYING.
@@ -89,13 +89,13 @@ _para_complete()
_para_audioc()
{
- _para_complete ~maan/para/para_audioc
+ _para_complete para_audioc
}
complete -F _para_audioc para_audioc
_para_client()
{
- _para_complete ~maan/para/para_client
+ _para_complete para_client
}
complete -o default -o nospace -F _para_client para_client
complete -o default -o nospace -F _para_client para
diff --git a/buffer_tree.c b/buffer_tree.c
index 9ae4d34c..b1eeb036 100644
--- a/buffer_tree.c
+++ b/buffer_tree.c
@@ -858,6 +858,8 @@ void btr_splice_out_node(struct btr_node *btrn)
ch->parent = btrn->parent;
if (btrn->parent)
list_move(&ch->node, &btrn->parent->children);
+ else
+ list_del(&ch->node);
}
assert(list_empty(&btrn->children));
btrn->parent = NULL;
diff --git a/command.c b/command.c
index a50b3844..3d40023f 100644
--- a/command.c
+++ b/command.c
@@ -35,8 +35,8 @@
#include "signal.h"
#include "version.h"
-struct server_command afs_cmds[] = {DEFINE_AFS_CMD_ARRAY};
-struct server_command server_cmds[] = {DEFINE_SERVER_CMD_ARRAY};
+static struct server_command afs_cmds[] = {DEFINE_AFS_CMD_ARRAY};
+static struct server_command server_cmds[] = {DEFINE_SERVER_CMD_ARRAY};
/** Commands including options must be shorter than this. */
#define MAX_COMMAND_LEN 32768
diff --git a/configure.ac b/configure.ac
index 0fd8fe8d..73e97997 100644
--- a/configure.ac
+++ b/configure.ac
@@ -295,7 +295,7 @@ fi
########################################################################### osl
have_osl=yes
OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LD_FLAGS="$LDFLAGS"
+OLD_LDFLAGS="$LDFLAGS"
OLD_LIBS="$LIBS"
AC_ARG_WITH(osl_headers, [AS_HELP_STRING(--with-osl-headers=dir,
[look for osl.h also in dir])])
@@ -390,7 +390,7 @@ esac
###################################################################### openssl
if test "$check_openssl" = "yes"; then
OLD_CPPFLAGS="$CPPFLAGS"
- OLD_LD_FLAGS="$LDFLAGS"
+ OLD_LDFLAGS="$LDFLAGS"
OLD_LIBS="$LIBS"
have_openssl="yes"
AC_ARG_WITH(openssl_headers, [AS_HELP_STRING(--with-openssl-headers=dir,
@@ -447,7 +447,7 @@ fi
########################################################################### gcrypt
if test "$check_gcrypt" = "yes"; then
OLD_CPPFLAGS="$CPPFLAGS"
- OLD_LD_FLAGS="$LDFLAGS"
+ OLD_LDFLAGS="$LDFLAGS"
OLD_LIBS="$LIBS"
have_gcrypt="yes"
AC_ARG_WITH(gcrypt_headers, [AS_HELP_STRING(--with-gcrypt-headers=dir,
@@ -539,7 +539,7 @@ AC_SUBST(ggo_descriptions_declared)
########################################################################### curses
have_curses="yes"
OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LD_FLAGS="$LDFLAGS"
+OLD_LDFLAGS="$LDFLAGS"
OLD_LIBS="$LIBS"
AC_ARG_WITH(curses_headers, [AS_HELP_STRING(--with-curses-headers=dir,
[look for curses.h also in dir])])
@@ -630,7 +630,7 @@ fi
####################################################### ogg/vorbis/speex/opus
have_ogg="yes"
OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LD_FLAGS="$LDFLAGS"
+OLD_LDFLAGS="$LDFLAGS"
OLD_LIBS="$LIBS"
AC_ARG_WITH(ogg_headers, [AS_HELP_STRING(--with-ogg-headers=dir,
[look for ogg headers also in dir])])
@@ -795,7 +795,7 @@ if test "$have_opus" = "yes"; then
recv_errlist_objs="$recv_errlist_objs opus_afh opus_common"
audiod_audio_formats="$audiod_audio_formats opus"
- server_audio_formats="$server_audio_formats opus"
+ audio_format_handlers="$audio_format_handlers opus"
else
AC_MSG_WARN([no ogg/opus $msg])
fi
@@ -805,7 +805,7 @@ LIBS="$OLD_LIBS"
########################################################################### faad
have_faad=yes
OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LD_FLAGS="$LDFLAGS"
+OLD_LDFLAGS="$LDFLAGS"
OLD_LIBS="$LIBS"
AC_ARG_WITH(faad_headers, [AS_HELP_STRING(--with-faad-headers=dir,
[look for neaacdec.h also in dir])])
@@ -851,7 +851,7 @@ LIBS="$OLD_LIBS"
########################################################################### mad
have_mad="yes"
OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LD_FLAGS="$LDFLAGS"
+OLD_LDFLAGS="$LDFLAGS"
OLD_LIBS="$LIBS"
AC_ARG_WITH(mad_headers, [AS_HELP_STRING(--with-mad-headers=dir,
@@ -895,7 +895,7 @@ LDFLAGS="$OLD_LDFLAGS"
LIBS="$OLD_LIBS"
###################################################################### libid3tag
OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LD_FLAGS="$LDFLAGS"
+OLD_LDFLAGS="$LDFLAGS"
OLD_LIBS="$LIBS"
have_libid3tag="yes"
@@ -936,7 +936,7 @@ LDFLAGS="$OLD_LDFLAGS"
LIBS="$OLD_LIBS"
########################################################################### flac
OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LD_FLAGS="$LDFLAGS"
+OLD_LDFLAGS="$LDFLAGS"
OLD_LIBS="$LIBS"
have_flac="yes"
@@ -981,7 +981,7 @@ LDFLAGS="$OLD_LDFLAGS"
LIBS="$OLD_LIBS"
########################################################################### oss
OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LD_FLAGS="$LDFLAGS"
+OLD_LDFLAGS="$LDFLAGS"
OLD_LIBS="$LIBS"
have_oss="yes"
@@ -1022,7 +1022,7 @@ LIBS="$OLD_LIBS"
########################################################################### alsa
OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LD_FLAGS="$LDFLAGS"
+OLD_LDFLAGS="$LDFLAGS"
OLD_LIBS="$LIBS"
msg="=> no alsa support for para_audiod/para_write"
@@ -1109,7 +1109,7 @@ else
fi
########################################################################### libao
OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LD_FLAGS="$LDFLAGS"
+OLD_LDFLAGS="$LDFLAGS"
OLD_LIBS="$LIBS"
have_ao="yes"
@@ -1172,7 +1172,7 @@ LDFLAGS="$OLD_LDFLAGS"
LIBS="$OLD_LIBS"
############################################################# readline
OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LD_FLAGS="$LDFLAGS"
+OLD_LDFLAGS="$LDFLAGS"
OLD_LIBS="$LIBS"
have_readline="yes"
@@ -1243,7 +1243,7 @@ LDFLAGS="$OLD_LDFLAGS"
LIBS="$OLD_LIBS"
############################################################# libsamplerate
OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LD_FLAGS="$LDFLAGS"
+OLD_LDFLAGS="$LDFLAGS"
OLD_LIBS="$LIBS"
have_samplerate="yes"
diff --git a/error.h b/error.h
index 51ace983..b0133dee 100644
--- a/error.h
+++ b/error.h
@@ -608,7 +608,7 @@ _static_inline_ const char *para_strerror(int num)
*
* This should be used for all calls to osl functions that return an osl error
* code. It changes the return value appropriately so that it can be used for
- * printing the correct error message vi para_strerror().
+ * printing the correct error message with para_strerror().
*
* \return \a ret if \a ret >= 0, a paraslash error code otherwise.
*/
diff --git a/fecdec_filter.c b/fecdec_filter.c
index 2f0a6746..691d696a 100644
--- a/fecdec_filter.c
+++ b/fecdec_filter.c
@@ -409,7 +409,7 @@ static int dispatch_slice(char *buf, size_t len, struct fec_header *h,
ret = fec_new(k, n, &pfd->fec);
if (ret < 0)
return ret;
- pfd->btrp = btr_pool_new("fecdec", 64 * 1024);
+ pfd->btrp = btr_pool_new("fecdec", 128 * 1024);
/* decode and clear the first group */
ret = decode_group(pfd->first_complete_group, fn);
if (ret < 0)
diff --git a/m4/gengetopt/makefile b/m4/gengetopt/makefile
index 035f44a5..79e101a3 100644
--- a/m4/gengetopt/makefile
+++ b/m4/gengetopt/makefile
@@ -1,6 +1,6 @@
define ggo_opts
--output-dir=$(cmdline_dir) \
- --set-version="$(GIT_VERSION) ($(codename))" \
+ --set-version="$(GIT_VERSION)" \
--arg-struct-name=$(*F)_args_info \
--file-name=$(*F).cmdline \
--func-name=$(*F)_cmdline_parser \
diff --git a/vss.c b/vss.c
index aec357ab..06707d6c 100644
--- a/vss.c
+++ b/vss.c
@@ -565,8 +565,14 @@ static int setup_next_fec_group(struct fec_client *fc, struct vss_task *vsst)
if (payload_size < g->slice_bytes)
memset(fc->extra_header_buf + payload_size, 0,
g->slice_bytes - payload_size);
- fc->src_data[i] = fc->extra_header_buf;
- assert(i == g->num_header_slices - 1);
+ /*
+ * There might be more than one header slice to fill although
+ * only the first one will be used. Set all header slices to
+ * our extra buffer.
+ */
+ while (i < g->num_header_slices)
+ fc->src_data[i++] = fc->extra_header_buf;
+ break; /* we don't want i to be increased. */
}
/*
diff --git a/web/documentation.in.html b/web/documentation.in.html
index 4d63a08f..f292af25 100644
--- a/web/documentation.in.html
+++ b/web/documentation.in.html
@@ -30,6 +30,7 @@
[para_write]
[para_gui]
[para_fade]
+ [para_play]
Source code documentation