aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2012-11-05 12:00:41 +0000
committerChristian Grothoff <christian@grothoff.org>2012-11-05 12:00:41 +0000
commit05e1eb339751b593c50cf40c3277e41a1fe02133 (patch)
tree01413a583eea1183f036c05ad352fc00a1154a56 /src
parent0d5c03f33e0162b2a078d73ba693f397898022cb (diff)
downloadgnunet-05e1eb339751b593c50cf40c3277e41a1fe02133.tar.gz
gnunet-05e1eb339751b593c50cf40c3277e41a1fe02133.zip
-version bumping
Diffstat (limited to 'src')
-rw-r--r--src/arm/Makefile.am2
-rw-r--r--src/ats/Makefile.am2
-rw-r--r--src/core/Makefile.am2
-rw-r--r--src/dht/Makefile.am2
-rw-r--r--src/fragmentation/Makefile.am2
-rw-r--r--src/fs/Makefile.am2
-rw-r--r--src/mesh/Makefile.am2
-rw-r--r--src/namestore/Makefile.am2
-rw-r--r--src/nat/Makefile.am2
-rw-r--r--src/statistics/Makefile.am2
-rw-r--r--src/stream/Makefile.am3
-rw-r--r--src/testing/Makefile.am2
-rw-r--r--src/transport/Makefile.am2
-rw-r--r--src/util/Makefile.am2
-rw-r--r--src/util/strings.c35
15 files changed, 34 insertions, 30 deletions
diff --git a/src/arm/Makefile.am b/src/arm/Makefile.am
index f91e4210f..c936a2224 100644
--- a/src/arm/Makefile.am
+++ b/src/arm/Makefile.am
@@ -25,7 +25,7 @@ libgnunetarm_la_LIBADD = \
25 $(GN_LIBINTL) $(XLIB) 25 $(GN_LIBINTL) $(XLIB)
26libgnunetarm_la_LDFLAGS = \ 26libgnunetarm_la_LDFLAGS = \
27 $(GN_LIB_LDFLAGS) $(WINFLAGS) \ 27 $(GN_LIB_LDFLAGS) $(WINFLAGS) \
28 -version-info 1:1:0 28 -version-info 1:2:0
29 29
30 30
31bin_PROGRAMS = \ 31bin_PROGRAMS = \
diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am
index 27ddc542a..8abd9e09c 100644
--- a/src/ats/Makefile.am
+++ b/src/ats/Makefile.am
@@ -35,7 +35,7 @@ libgnunetats_la_LIBADD = \
35 35
36libgnunetats_la_LDFLAGS = \ 36libgnunetats_la_LDFLAGS = \
37 $(GN_LIB_LDFLAGS) \ 37 $(GN_LIB_LDFLAGS) \
38 -version-info 2:0:2 38 -version-info 3:0:3
39 39
40 40
41libexec_PROGRAMS = \ 41libexec_PROGRAMS = \
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index 3091249f8..6d073da1f 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -29,7 +29,7 @@ libgnunetcore_la_LIBADD = \
29 $(GN_LIBINTL) $(XLIB) 29 $(GN_LIBINTL) $(XLIB)
30libgnunetcore_la_LDFLAGS = \ 30libgnunetcore_la_LDFLAGS = \
31 $(GN_LIB_LDFLAGS) $(WINFLAGS) \ 31 $(GN_LIB_LDFLAGS) $(WINFLAGS) \
32 -version-info 0:0:0 32 -version-info 0:1:0
33 33
34 34
35libexec_PROGRAMS = \ 35libexec_PROGRAMS = \
diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am
index e204f09f9..4f74699e3 100644
--- a/src/dht/Makefile.am
+++ b/src/dht/Makefile.am
@@ -32,7 +32,7 @@ libgnunetdht_la_LIBADD = \
32 $(LTLIBINTL) 32 $(LTLIBINTL)
33libgnunetdht_la_LDFLAGS = \ 33libgnunetdht_la_LDFLAGS = \
34 $(GN_LIB_LDFLAGS) $(WINFLAGS) \ 34 $(GN_LIB_LDFLAGS) $(WINFLAGS) \
35 -version-info 1:0:1 35 -version-info 1:1:1
36 36
37 37
38plugin_LTLIBRARIES = \ 38plugin_LTLIBRARIES = \
diff --git a/src/fragmentation/Makefile.am b/src/fragmentation/Makefile.am
index 7eb819d29..333a270e7 100644
--- a/src/fragmentation/Makefile.am
+++ b/src/fragmentation/Makefile.am
@@ -19,7 +19,7 @@ libgnunetfragmentation_la_LIBADD = -lm \
19 $(LTLIBINTL) 19 $(LTLIBINTL)
20libgnunetfragmentation_la_LDFLAGS = \ 20libgnunetfragmentation_la_LDFLAGS = \
21 $(GN_LIB_LDFLAGS) \ 21 $(GN_LIB_LDFLAGS) \
22 -version-info 1:0:1 22 -version-info 2:0:0
23 23
24check_PROGRAMS = \ 24check_PROGRAMS = \
25 test_fragmentation 25 test_fragmentation
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index c5dba2d58..f7af07682 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -52,7 +52,7 @@ libgnunetfs_la_LIBADD = \
52 52
53libgnunetfs_la_LDFLAGS = \ 53libgnunetfs_la_LDFLAGS = \
54 $(GN_LIB_LDFLAGS) $(WINFLAGS) \ 54 $(GN_LIB_LDFLAGS) $(WINFLAGS) \
55 -version-info 2:1:0 55 -version-info 2:2:0
56 56
57 57
58libgnunetfstest_a_SOURCES = \ 58libgnunetfstest_a_SOURCES = \
diff --git a/src/mesh/Makefile.am b/src/mesh/Makefile.am
index 88d4a93ca..33abb6b62 100644
--- a/src/mesh/Makefile.am
+++ b/src/mesh/Makefile.am
@@ -61,7 +61,7 @@ libgnunetmeshblock_la_LIBADD = \
61 $(LTLIBINTL) 61 $(LTLIBINTL)
62libgnunetmeshblock_la_LDFLAGS = \ 62libgnunetmeshblock_la_LDFLAGS = \
63 $(GN_LIB_LDFLAGS) $(WINFLAGS) \ 63 $(GN_LIB_LDFLAGS) $(WINFLAGS) \
64 -version-info 1:0:0 64 -version-info 2:0:0
65 65
66gnunet_service_mesh_SOURCES = \ 66gnunet_service_mesh_SOURCES = \
67 gnunet-service-mesh.c \ 67 gnunet-service-mesh.c \
diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am
index 04dd870b3..1d36fe792 100644
--- a/src/namestore/Makefile.am
+++ b/src/namestore/Makefile.am
@@ -63,7 +63,7 @@ libgnunetnamestore_la_LIBADD = \
63 $(GN_LIBINTL) 63 $(GN_LIBINTL)
64libgnunetnamestore_la_LDFLAGS = \ 64libgnunetnamestore_la_LDFLAGS = \
65 $(GN_LIB_LDFLAGS) $(WINFLAGS) \ 65 $(GN_LIB_LDFLAGS) $(WINFLAGS) \
66 -version-info 0:0:0 66 -version-info 0:1:0
67 67
68libexec_PROGRAMS = \ 68libexec_PROGRAMS = \
69 gnunet-service-namestore 69 gnunet-service-namestore
diff --git a/src/nat/Makefile.am b/src/nat/Makefile.am
index 0394569fe..00d72ebba 100644
--- a/src/nat/Makefile.am
+++ b/src/nat/Makefile.am
@@ -63,7 +63,7 @@ libgnunetnat_la_LIBADD = \
63 63
64libgnunetnat_la_LDFLAGS = \ 64libgnunetnat_la_LDFLAGS = \
65 $(GN_LIB_LDFLAGS) $(WINFLAGS) \ 65 $(GN_LIB_LDFLAGS) $(WINFLAGS) \
66 -version-info 0:0:0 66 -version-info 0:1:0
67 67
68check_PROGRAMS = \ 68check_PROGRAMS = \
69 test_nat \ 69 test_nat \
diff --git a/src/statistics/Makefile.am b/src/statistics/Makefile.am
index f4d0c3b99..fe792127f 100644
--- a/src/statistics/Makefile.am
+++ b/src/statistics/Makefile.am
@@ -25,7 +25,7 @@ libgnunetstatistics_la_LIBADD = \
25 $(GN_LIBINTL) $(XLIB) 25 $(GN_LIBINTL) $(XLIB)
26libgnunetstatistics_la_LDFLAGS = \ 26libgnunetstatistics_la_LDFLAGS = \
27 $(GN_LIB_LDFLAGS) $(WINFLAGS) \ 27 $(GN_LIB_LDFLAGS) $(WINFLAGS) \
28 -version-info 1:1:1 28 -version-info 1:2:1
29 29
30libexec_PROGRAMS = \ 30libexec_PROGRAMS = \
31 gnunet-service-statistics 31 gnunet-service-statistics
diff --git a/src/stream/Makefile.am b/src/stream/Makefile.am
index a8afd93cb..8a5e141ab 100644
--- a/src/stream/Makefile.am
+++ b/src/stream/Makefile.am
@@ -18,7 +18,8 @@ libgnunetstream_la_LIBADD = \
18 $(top_builddir)/src/lockmanager/libgnunetlockmanager.la \ 18 $(top_builddir)/src/lockmanager/libgnunetlockmanager.la \
19 $(top_builddir)/src/util/libgnunetutil.la $(XLIB) 19 $(top_builddir)/src/util/libgnunetutil.la $(XLIB)
20libgnunetstream_la_LDFLAGS = \ 20libgnunetstream_la_LDFLAGS = \
21 $(GN_LIB_LDFLAGS) 21 $(GN_LIB_LDFLAGS) \
22 -version-info 0:0:0
22 23
23if HAVE_BENCHMARKS 24if HAVE_BENCHMARKS
24 STREAM_BENCHMARKS = \ 25 STREAM_BENCHMARKS = \
diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index f680ad669..ea1c1b1a7 100644
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -24,7 +24,7 @@ libgnunettesting_la_LIBADD = \
24 $(LTLIBINTL) 24 $(LTLIBINTL)
25libgnunettesting_la_LDFLAGS = \ 25libgnunettesting_la_LDFLAGS = \
26 $(GN_LIB_LDFLAGS) \ 26 $(GN_LIB_LDFLAGS) \
27 -version-info 0:1:0 27 -version-info 1:0:0
28 28
29bin_PROGRAMS = \ 29bin_PROGRAMS = \
30 gnunet-testing-run-service \ 30 gnunet-testing-run-service \
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index eafcdae02..a0d3f3429 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -107,7 +107,7 @@ libgnunettransport_la_LIBADD = \
107 $(GN_LIBINTL) 107 $(GN_LIBINTL)
108libgnunettransport_la_LDFLAGS = \ 108libgnunettransport_la_LDFLAGS = \
109 $(GN_LIB_LDFLAGS) $(WINFLAGS) \ 109 $(GN_LIB_LDFLAGS) $(WINFLAGS) \
110 -version-info 1:0:0 110 -version-info 1:1:0
111 111
112libexec_PROGRAMS = \ 112libexec_PROGRAMS = \
113 $(WLAN_BIN) \ 113 $(WLAN_BIN) \
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 6da3b8d27..217229688 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -119,7 +119,7 @@ libgnunetutil_la_LIBADD = \
119 119
120libgnunetutil_la_LDFLAGS = \ 120libgnunetutil_la_LDFLAGS = \
121 $(GN_LIB_LDFLAGS) \ 121 $(GN_LIB_LDFLAGS) \
122 -version-info 8:0:0 122 -version-info 9:0:0
123 123
124 124
125libexec_PROGRAMS = \ 125libexec_PROGRAMS = \
diff --git a/src/util/strings.c b/src/util/strings.c
index 6fae8e713..70986a978 100644
--- a/src/util/strings.c
+++ b/src/util/strings.c
@@ -371,24 +371,22 @@ char *
371GNUNET_STRINGS_conv (const char *input, size_t len, const char *input_charset, const char *output_charset) 371GNUNET_STRINGS_conv (const char *input, size_t len, const char *input_charset, const char *output_charset)
372{ 372{
373 char *ret; 373 char *ret;
374
375 uint8_t *u8_string; 374 uint8_t *u8_string;
376 char *encoded_string; 375 char *encoded_string;
377 size_t u8_string_length; 376 size_t u8_string_length;
378 size_t encoded_string_length; 377 size_t encoded_string_length;
379 378
380 u8_string = u8_conv_from_encoding (input_charset, iconveh_error, input, len, NULL, NULL, &u8_string_length); 379 u8_string = u8_conv_from_encoding (input_charset,
380 iconveh_error,
381 input, len,
382 NULL, NULL,
383 &u8_string_length);
381 if (NULL == u8_string) 384 if (NULL == u8_string)
382 { 385 {
383 LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "u8_conv_from_encoding"); 386 LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "u8_conv_from_encoding");
384 LOG (GNUNET_ERROR_TYPE_WARNING, _("Character sets requested were `%s'->`%s'\n"), 387 goto fail;
385 input_charset, "UTF-8");
386 ret = GNUNET_malloc (len + 1);
387 memcpy (ret, input, len);
388 ret[len] = '\0';
389 return ret;
390 } 388 }
391 if (strcmp (output_charset, "UTF-8") == 0) 389 if (0 == strcmp (output_charset, "UTF-8"))
392 { 390 {
393 ret = GNUNET_malloc (u8_string_length + 1); 391 ret = GNUNET_malloc (u8_string_length + 1);
394 memcpy (ret, u8_string, u8_string_length); 392 memcpy (ret, u8_string, u8_string_length);
@@ -396,23 +394,28 @@ GNUNET_STRINGS_conv (const char *input, size_t len, const char *input_charset, c
396 free (u8_string); 394 free (u8_string);
397 return ret; 395 return ret;
398 } 396 }
399 encoded_string = u8_conv_to_encoding (output_charset, iconveh_error, u8_string, u8_string_length, NULL, NULL, &encoded_string_length); 397 encoded_string = u8_conv_to_encoding (output_charset, iconveh_error,
398 u8_string, u8_string_length,
399 NULL, NULL,
400 &encoded_string_length);
400 free (u8_string); 401 free (u8_string);
401 if (NULL == encoded_string) 402 if (NULL == encoded_string)
402 { 403 {
403 LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "u8_conv_to_encoding"); 404 LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "u8_conv_to_encoding");
404 LOG (GNUNET_ERROR_TYPE_WARNING, _("Character sets requested were `%s'->`%s'\n"), 405 goto fail;
405 "UTF-8", output_charset);
406 ret = GNUNET_malloc (len + 1);
407 memcpy (ret, input, len);
408 ret[len] = '\0';
409 return ret;
410 } 406 }
411 ret = GNUNET_malloc (encoded_string_length + 1); 407 ret = GNUNET_malloc (encoded_string_length + 1);
412 memcpy (ret, encoded_string, encoded_string_length); 408 memcpy (ret, encoded_string, encoded_string_length);
413 ret[encoded_string_length] = '\0'; 409 ret[encoded_string_length] = '\0';
414 free (encoded_string); 410 free (encoded_string);
415 return ret; 411 return ret;
412 fail:
413 LOG (GNUNET_ERROR_TYPE_WARNING, _("Character sets requested were `%s'->`%s'\n"),
414 "UTF-8", output_charset);
415 ret = GNUNET_malloc (len + 1);
416 memcpy (ret, input, len);
417 ret[len] = '\0';
418 return ret;
416} 419}
417 420
418 421
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 15:08:43 +0000