Merge /home/maan/scm/paraslash_fml/paraslash
authorAndre Noll <maan@systemlinux.org>
Tue, 20 Feb 2007 19:16:09 +0000 (20:16 +0100)
committerAndre Noll <maan@systemlinux.org>
Tue, 20 Feb 2007 19:16:09 +0000 (20:16 +0100)
configure.ac
dccp_send.c
http_recv.c
mysql_selector.c
write_common.c

index 3db6082..fd01b18 100644 (file)
@@ -100,6 +100,7 @@ write_cmdline_objs="write.cmdline file_write.cmdline"
 write_errlist_objs="write write_common file_write time fd string sched stdin"
 write_ldflags=""
 writers=" file"
+default_writer="FILE_WRITE"
 
 client_cmdline_objs="client.cmdline"
 client_errlist_objs="client net string crypt fd sched stdin stdout client_common"
@@ -191,6 +192,7 @@ if test ${have_core_audio} = yes; then
        write_cmdline_objs="$write_cmdline_objs osx_write.cmdline"
        write_ldflags="$write_ldflags $f"
        writers="$writers osx"
+       default_writer="OSX_WRITE"
        AC_DEFINE(HAVE_CORE_AUDIO, 1, define to 1 on Mac Os X)
 fi
 ########################################################################### gtk2
@@ -415,6 +417,7 @@ if test "$have_alsa" = "yes"; then
        write_cmdline_objs="$write_cmdline_objs alsa_write.cmdline"
        write_ldflags="$write_ldflags -lasound"
        writers="$writers alsa"
+       default_writer="ALSA_WRITE"
 fi
 CPPFLAGS="$OLD_CPPFLAGS"
 LDFLAGS="$OLD_LDFLAGS"
@@ -542,6 +545,7 @@ AC_DEFINE_UNQUOTED(INIT_AUDIOC_ERRLISTS,
 enum="$(for i in $writers; do printf "${i}_WRITE, " | tr '[a-z]' '[A-Z]'; done)"
 AC_DEFINE_UNQUOTED(WRITER_ENUM, $enum NUM_SUPPORTED_WRITERS,
        enum of supported writers)
+AC_DEFINE_UNQUOTED(DEFAULT_WRITER, $default_writer, use this writer if none was specified)
 names="$(for i in $writers; do printf \"$i\",' ' ; done)"
 AC_DEFINE_UNQUOTED(WRITER_NAMES, $names, supported writer names)
 inits="$(for i in $writers; do printf 'extern void '$i'_write_init(struct writer *); '; done)"
index c335e76..e4b5087 100644 (file)
@@ -131,7 +131,7 @@ again:
        size = PARA_MIN(1024, len - written);
        ret = write(fd, buf + written, size);
        if (ret < 0) {
-               if (errno != EAGAIN || !retries++ > DCCP_WRITE_RETRIES)
+               if (errno != EAGAIN || retries++ > DCCP_WRITE_RETRIES)
                        goto err_out;
                PARA_DEBUG_LOG("EAGAIN #%d@%zd/%zd\n", retries, written, len);
                goto again;
index 6589833..8b55039 100644 (file)
@@ -185,7 +185,7 @@ static int http_recv_open(struct receiver_node *rn)
        rn->private_data = para_calloc(sizeof(struct private_http_recv_data));
        phd = rn->private_data;
        ret = get_host_info(conf->host_arg, &he);
-       if (!ret < 0)
+       if (ret < 0)
                goto err_out;
        /* get new socket */
        ret = get_socket();
index f50ac41..d4ccc86 100644 (file)
@@ -578,40 +578,38 @@ out:
        return ret;
 }
 
-/* get attributes by name. If verbose is not 0, get_a writes a string
- * into atts of the form 'att1="0",att2="1"', which is used in com_cam
- * for contructing a mysql update query.
- * never returns NULL in *NON VERBOSE* mode
+/*
+ * get attributes by name. If verbose is not 0, this function returns a string
+ * of the form 'att1="0",att2="1"'... which is used in com_cam() for
+ * constructing a mysql update query. Otherwise the space-separated list of all
+ * attributes which are set in the audio file given by name is returned.  Never
+ * returns NULL in *NON VERBOSE* mode.
  */
 static char *get_atts(char *name, int verbose)
 {
        char *atts = NULL, *buf, *ebn;
        void *result = NULL, *result2 = NULL;
        MYSQL_ROW row, row2;
-       int i, ret;
-       unsigned int num_fields;
+       int i;
+       unsigned num_fields;
 
-       ret = -E_NOATTS;
        result2 = get_all_attributes();
        if (!result2)
                goto out;
-       ret = -E_ESCAPE;
-       if (!(ebn = escaped_basename(name)))
+       ebn = escaped_basename(name);
+       if (!ebn)
                goto out;
        buf = make_message("select * from data where name='%s'", ebn);
        free(ebn);
-       ret = -E_NORESULT;
        result = get_result(buf);
        free(buf);
        if (!result)
                goto out;
-       ret = -E_EMPTY_RESULT;
        num_fields = mysql_num_fields(result);
        if (num_fields < 5)
                goto out;
        mysql_data_seek(result2, 4); /* skip Lastplayed, Numplayed... */
        row = mysql_fetch_row(result);
-       ret = -E_NOROW;
        if (!row)
                goto out;
        for (i = 4; i < num_fields; i++) {
@@ -626,7 +624,6 @@ static char *get_atts(char *name, int verbose)
                if (verbose)
                        atts = para_strcat(atts, is_set? "=\"1\"" : "=\"0\"");
        }
-       ret = 1;
 out:
        if (result2)
                mysql_free_result(result2);
index ac92bc1..78d1523 100644 (file)
@@ -236,15 +236,9 @@ void *check_writer_arg(const char *wa, int *writer_num)
 struct writer_node_group *setup_default_wng(void)
 {
        struct writer_node_group *wng = wng_new(1);
-       enum writer_enum default_writer;
-
-       if (NUM_SUPPORTED_WRITERS == 1)
-               default_writer = FILE_WRITE;
-       else
-               default_writer = 1;
-       wng->writer_nodes[0].writer = &writers[default_writer];
+       wng->writer_nodes[0].writer = &writers[DEFAULT_WRITER];
        PARA_INFO_LOG("using default writer: %s %p\n",
-               writer_names[default_writer], writers[default_writer].parse_config);
-       wng->writer_nodes[0].conf = writers[default_writer].parse_config("");
+               writer_names[DEFAULT_WRITER], writers[DEFAULT_WRITER].parse_config);
+       wng->writer_nodes[0].conf = writers[DEFAULT_WRITER].parse_config("");
        return wng;
 }