[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r24714 - in gnunet/src: arm ats core dht fragmentation fs m
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r24714 - in gnunet/src: arm ats core dht fragmentation fs mesh namestore nat statistics stream testing transport util |
|
Date: |
Mon, 5 Nov 2012 13:00:41 +0100 |
Author: grothoff
Date: 2012-11-05 13:00:41 +0100 (Mon, 05 Nov 2012)
New Revision: 24714
Modified:
gnunet/src/arm/Makefile.am
gnunet/src/ats/Makefile.am
gnunet/src/core/Makefile.am
gnunet/src/dht/Makefile.am
gnunet/src/fragmentation/Makefile.am
gnunet/src/fs/Makefile.am
gnunet/src/mesh/Makefile.am
gnunet/src/namestore/Makefile.am
gnunet/src/nat/Makefile.am
gnunet/src/statistics/Makefile.am
gnunet/src/stream/Makefile.am
gnunet/src/testing/Makefile.am
gnunet/src/transport/Makefile.am
gnunet/src/util/Makefile.am
gnunet/src/util/strings.c
Log:
-version bumping
Modified: gnunet/src/arm/Makefile.am
===================================================================
--- gnunet/src/arm/Makefile.am 2012-11-05 11:30:50 UTC (rev 24713)
+++ gnunet/src/arm/Makefile.am 2012-11-05 12:00:41 UTC (rev 24714)
@@ -25,7 +25,7 @@
$(GN_LIBINTL) $(XLIB)
libgnunetarm_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) $(WINFLAGS) \
- -version-info 1:1:0
+ -version-info 1:2:0
bin_PROGRAMS = \
Modified: gnunet/src/ats/Makefile.am
===================================================================
--- gnunet/src/ats/Makefile.am 2012-11-05 11:30:50 UTC (rev 24713)
+++ gnunet/src/ats/Makefile.am 2012-11-05 12:00:41 UTC (rev 24714)
@@ -35,7 +35,7 @@
libgnunetats_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) \
- -version-info 2:0:2
+ -version-info 3:0:3
libexec_PROGRAMS = \
Modified: gnunet/src/core/Makefile.am
===================================================================
--- gnunet/src/core/Makefile.am 2012-11-05 11:30:50 UTC (rev 24713)
+++ gnunet/src/core/Makefile.am 2012-11-05 12:00:41 UTC (rev 24714)
@@ -29,7 +29,7 @@
$(GN_LIBINTL) $(XLIB)
libgnunetcore_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) $(WINFLAGS) \
- -version-info 0:0:0
+ -version-info 0:1:0
libexec_PROGRAMS = \
Modified: gnunet/src/dht/Makefile.am
===================================================================
--- gnunet/src/dht/Makefile.am 2012-11-05 11:30:50 UTC (rev 24713)
+++ gnunet/src/dht/Makefile.am 2012-11-05 12:00:41 UTC (rev 24714)
@@ -32,7 +32,7 @@
$(LTLIBINTL)
libgnunetdht_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) $(WINFLAGS) \
- -version-info 1:0:1
+ -version-info 1:1:1
plugin_LTLIBRARIES = \
Modified: gnunet/src/fragmentation/Makefile.am
===================================================================
--- gnunet/src/fragmentation/Makefile.am 2012-11-05 11:30:50 UTC (rev
24713)
+++ gnunet/src/fragmentation/Makefile.am 2012-11-05 12:00:41 UTC (rev
24714)
@@ -19,7 +19,7 @@
$(LTLIBINTL)
libgnunetfragmentation_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) \
- -version-info 1:0:1
+ -version-info 2:0:0
check_PROGRAMS = \
test_fragmentation
Modified: gnunet/src/fs/Makefile.am
===================================================================
--- gnunet/src/fs/Makefile.am 2012-11-05 11:30:50 UTC (rev 24713)
+++ gnunet/src/fs/Makefile.am 2012-11-05 12:00:41 UTC (rev 24714)
@@ -52,7 +52,7 @@
libgnunetfs_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) $(WINFLAGS) \
- -version-info 2:1:0
+ -version-info 2:2:0
libgnunetfstest_a_SOURCES = \
Modified: gnunet/src/mesh/Makefile.am
===================================================================
--- gnunet/src/mesh/Makefile.am 2012-11-05 11:30:50 UTC (rev 24713)
+++ gnunet/src/mesh/Makefile.am 2012-11-05 12:00:41 UTC (rev 24714)
@@ -61,7 +61,7 @@
$(LTLIBINTL)
libgnunetmeshblock_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) $(WINFLAGS) \
- -version-info 1:0:0
+ -version-info 2:0:0
gnunet_service_mesh_SOURCES = \
gnunet-service-mesh.c \
Modified: gnunet/src/namestore/Makefile.am
===================================================================
--- gnunet/src/namestore/Makefile.am 2012-11-05 11:30:50 UTC (rev 24713)
+++ gnunet/src/namestore/Makefile.am 2012-11-05 12:00:41 UTC (rev 24714)
@@ -63,7 +63,7 @@
$(GN_LIBINTL)
libgnunetnamestore_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) $(WINFLAGS) \
- -version-info 0:0:0
+ -version-info 0:1:0
libexec_PROGRAMS = \
gnunet-service-namestore
Modified: gnunet/src/nat/Makefile.am
===================================================================
--- gnunet/src/nat/Makefile.am 2012-11-05 11:30:50 UTC (rev 24713)
+++ gnunet/src/nat/Makefile.am 2012-11-05 12:00:41 UTC (rev 24714)
@@ -63,7 +63,7 @@
libgnunetnat_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) $(WINFLAGS) \
- -version-info 0:0:0
+ -version-info 0:1:0
check_PROGRAMS = \
test_nat \
Modified: gnunet/src/statistics/Makefile.am
===================================================================
--- gnunet/src/statistics/Makefile.am 2012-11-05 11:30:50 UTC (rev 24713)
+++ gnunet/src/statistics/Makefile.am 2012-11-05 12:00:41 UTC (rev 24714)
@@ -25,7 +25,7 @@
$(GN_LIBINTL) $(XLIB)
libgnunetstatistics_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) $(WINFLAGS) \
- -version-info 1:1:1
+ -version-info 1:2:1
libexec_PROGRAMS = \
gnunet-service-statistics
Modified: gnunet/src/stream/Makefile.am
===================================================================
--- gnunet/src/stream/Makefile.am 2012-11-05 11:30:50 UTC (rev 24713)
+++ gnunet/src/stream/Makefile.am 2012-11-05 12:00:41 UTC (rev 24714)
@@ -18,7 +18,8 @@
$(top_builddir)/src/lockmanager/libgnunetlockmanager.la \
$(top_builddir)/src/util/libgnunetutil.la $(XLIB)
libgnunetstream_la_LDFLAGS = \
- $(GN_LIB_LDFLAGS)
+ $(GN_LIB_LDFLAGS) \
+ -version-info 0:0:0
if HAVE_BENCHMARKS
STREAM_BENCHMARKS = \
Modified: gnunet/src/testing/Makefile.am
===================================================================
--- gnunet/src/testing/Makefile.am 2012-11-05 11:30:50 UTC (rev 24713)
+++ gnunet/src/testing/Makefile.am 2012-11-05 12:00:41 UTC (rev 24714)
@@ -24,7 +24,7 @@
$(LTLIBINTL)
libgnunettesting_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) \
- -version-info 0:1:0
+ -version-info 1:0:0
bin_PROGRAMS = \
gnunet-testing-run-service \
Modified: gnunet/src/transport/Makefile.am
===================================================================
--- gnunet/src/transport/Makefile.am 2012-11-05 11:30:50 UTC (rev 24713)
+++ gnunet/src/transport/Makefile.am 2012-11-05 12:00:41 UTC (rev 24714)
@@ -107,7 +107,7 @@
$(GN_LIBINTL)
libgnunettransport_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) $(WINFLAGS) \
- -version-info 1:0:0
+ -version-info 1:1:0
libexec_PROGRAMS = \
$(WLAN_BIN) \
Modified: gnunet/src/util/Makefile.am
===================================================================
--- gnunet/src/util/Makefile.am 2012-11-05 11:30:50 UTC (rev 24713)
+++ gnunet/src/util/Makefile.am 2012-11-05 12:00:41 UTC (rev 24714)
@@ -119,7 +119,7 @@
libgnunetutil_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) \
- -version-info 8:0:0
+ -version-info 9:0:0
libexec_PROGRAMS = \
Modified: gnunet/src/util/strings.c
===================================================================
--- gnunet/src/util/strings.c 2012-11-05 11:30:50 UTC (rev 24713)
+++ gnunet/src/util/strings.c 2012-11-05 12:00:41 UTC (rev 24714)
@@ -371,24 +371,22 @@
GNUNET_STRINGS_conv (const char *input, size_t len, const char *input_charset,
const char *output_charset)
{
char *ret;
-
uint8_t *u8_string;
char *encoded_string;
size_t u8_string_length;
size_t encoded_string_length;
- u8_string = u8_conv_from_encoding (input_charset, iconveh_error, input, len,
NULL, NULL, &u8_string_length);
+ u8_string = u8_conv_from_encoding (input_charset,
+ iconveh_error,
+ input, len,
+ NULL, NULL,
+ &u8_string_length);
if (NULL == u8_string)
{
LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "u8_conv_from_encoding");
- LOG (GNUNET_ERROR_TYPE_WARNING, _("Character sets requested were
`%s'->`%s'\n"),
- input_charset, "UTF-8");
- ret = GNUNET_malloc (len + 1);
- memcpy (ret, input, len);
- ret[len] = '\0';
- return ret;
+ goto fail;
}
- if (strcmp (output_charset, "UTF-8") == 0)
+ if (0 == strcmp (output_charset, "UTF-8"))
{
ret = GNUNET_malloc (u8_string_length + 1);
memcpy (ret, u8_string, u8_string_length);
@@ -396,23 +394,28 @@
free (u8_string);
return ret;
}
- encoded_string = u8_conv_to_encoding (output_charset, iconveh_error,
u8_string, u8_string_length, NULL, NULL, &encoded_string_length);
+ encoded_string = u8_conv_to_encoding (output_charset, iconveh_error,
+ u8_string, u8_string_length,
+ NULL, NULL,
+ &encoded_string_length);
free (u8_string);
if (NULL == encoded_string)
{
LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "u8_conv_to_encoding");
- LOG (GNUNET_ERROR_TYPE_WARNING, _("Character sets requested were
`%s'->`%s'\n"),
- "UTF-8", output_charset);
- ret = GNUNET_malloc (len + 1);
- memcpy (ret, input, len);
- ret[len] = '\0';
- return ret;
+ goto fail;
}
ret = GNUNET_malloc (encoded_string_length + 1);
memcpy (ret, encoded_string, encoded_string_length);
ret[encoded_string_length] = '\0';
free (encoded_string);
return ret;
+ fail:
+ LOG (GNUNET_ERROR_TYPE_WARNING, _("Character sets requested were
`%s'->`%s'\n"),
+ "UTF-8", output_charset);
+ ret = GNUNET_malloc (len + 1);
+ memcpy (ret, input, len);
+ ret[len] = '\0';
+ return ret;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r24714 - in gnunet/src: arm ats core dht fragmentation fs mesh namestore nat statistics stream testing transport util,
gnunet <=