diff options
| -rw-r--r-- | Makefile.am | 34 | ||||
| -rw-r--r-- | include/tinyrad_internal.h (renamed from include/tinyrad_common.h) | 4 | ||||
| -rw-r--r-- | lib/libtinyrad/libtinyrad.h | 2 | ||||
| -rw-r--r-- | src/common.h | 2 | ||||
| -rw-r--r-- | tests/common.h | 2 | ||||
| -rw-r--r-- | tests/dict-data.h | 2 |
6 files changed, 23 insertions, 23 deletions
diff --git a/Makefile.am b/Makefile.am index 6a58051..b9e881a 100644 --- a/Makefile.am +++ b/Makefile.am | |||
| @@ -76,8 +76,8 @@ man_MANS = | |||
| 76 | info_TEXINFOS = | 76 | info_TEXINFOS = |
| 77 | noinst_LTLIBRARIES = | 77 | noinst_LTLIBRARIES = |
| 78 | noinst_LIBRARIES = | 78 | noinst_LIBRARIES = |
| 79 | noinst_HEADERS = include/tinyrad_common.h \ | 79 | noinst_HEADERS = include/tinyrad_compat.h \ |
| 80 | include/tinyrad_compat.h | 80 | include/tinyrad_internal.h |
| 81 | noinst_PROGRAMS = | 81 | noinst_PROGRAMS = |
| 82 | bin_PROGRAMS = | 82 | bin_PROGRAMS = |
| 83 | bin_SCRIPTS = | 83 | bin_SCRIPTS = |
| @@ -144,7 +144,7 @@ EXTRA_DIST = \ | |||
| 144 | doc/rfc/rfc6929.txt \ | 144 | doc/rfc/rfc6929.txt \ |
| 145 | doc/rfc/rfc8044.txt \ | 145 | doc/rfc/rfc8044.txt \ |
| 146 | include/tinyrad.h \ | 146 | include/tinyrad.h \ |
| 147 | include/tinyrad_common.h \ | 147 | include/tinyrad_internal.h \ |
| 148 | include/tinyrad_compat.h \ | 148 | include/tinyrad_compat.h \ |
| 149 | lib/libtinyrad/libtinyrad.sym \ | 149 | lib/libtinyrad/libtinyrad.sym \ |
| 150 | tests/test-dict-defaults.sh | 150 | tests/test-dict-defaults.sh |
| @@ -221,7 +221,7 @@ lib_libtinyrad_a_CPPFLAGS = $(AM_CPPFLAGS) \ | |||
| 221 | -I$(srcdir)/lib/libtinyrad | 221 | -I$(srcdir)/lib/libtinyrad |
| 222 | lib_libtinyrad_a_CFLAGS = $(AM_CFLAGS) | 222 | lib_libtinyrad_a_CFLAGS = $(AM_CFLAGS) |
| 223 | lib_libtinyrad_a_SOURCES = include/tinyrad.h \ | 223 | lib_libtinyrad_a_SOURCES = include/tinyrad.h \ |
| 224 | include/tinyrad_common.h \ | 224 | include/tinyrad_internal.h \ |
| 225 | include/tinyrad_compat.h \ | 225 | include/tinyrad_compat.h \ |
| 226 | lib/libtinyrad/libtinyrad.h \ | 226 | lib/libtinyrad/libtinyrad.h \ |
| 227 | lib/libtinyrad/larray.c \ | 227 | lib/libtinyrad/larray.c \ |
| @@ -283,7 +283,7 @@ src_tinyrad_SOURCES = include/tinyrad.h \ | |||
| 283 | src_tinyrad_dict_DEPENDENCIES = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) | 283 | src_tinyrad_dict_DEPENDENCIES = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) |
| 284 | src_tinyrad_dict_LDADD = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) | 284 | src_tinyrad_dict_LDADD = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) |
| 285 | src_tinyrad_dict_SOURCES = include/tinyrad.h \ | 285 | src_tinyrad_dict_SOURCES = include/tinyrad.h \ |
| 286 | include/tinyrad_common.h \ | 286 | include/tinyrad_internal.h \ |
| 287 | include/tinyrad_compat.h \ | 287 | include/tinyrad_compat.h \ |
| 288 | src/common.c \ | 288 | src/common.c \ |
| 289 | src/common.h \ | 289 | src/common.h \ |
| @@ -294,7 +294,7 @@ src_tinyrad_dict_SOURCES = include/tinyrad.h \ | |||
| 294 | src_tinyrad_url_DEPENDENCIES = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) | 294 | src_tinyrad_url_DEPENDENCIES = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) |
| 295 | src_tinyrad_url_LDADD = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) | 295 | src_tinyrad_url_LDADD = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) |
| 296 | src_tinyrad_url_SOURCES = include/tinyrad.h \ | 296 | src_tinyrad_url_SOURCES = include/tinyrad.h \ |
| 297 | include/tinyrad_common.h \ | 297 | include/tinyrad_internal.h \ |
| 298 | include/tinyrad_compat.h \ | 298 | include/tinyrad_compat.h \ |
| 299 | src/common.c \ | 299 | src/common.c \ |
| 300 | src/common.h \ | 300 | src/common.h \ |
| @@ -310,7 +310,7 @@ src_tinyradproxy_LDFLAGS = $(AM_LDFLAGS) | |||
| 310 | src_tinyradproxy_LDADD = $(lib_LTLIBRARIES) \ | 310 | src_tinyradproxy_LDADD = $(lib_LTLIBRARIES) \ |
| 311 | $(noinst_LIBRARIES) | 311 | $(noinst_LIBRARIES) |
| 312 | src_tinyradproxy_SOURCES = include/tinyrad.h \ | 312 | src_tinyradproxy_SOURCES = include/tinyrad.h \ |
| 313 | include/tinyrad_common.h \ | 313 | include/tinyrad_internal.h \ |
| 314 | include/tinyrad_compat.h \ | 314 | include/tinyrad_compat.h \ |
| 315 | src/common.c \ | 315 | src/common.c \ |
| 316 | src/common.h \ | 316 | src/common.h \ |
| @@ -321,7 +321,7 @@ src_tinyradproxy_SOURCES = include/tinyrad.h \ | |||
| 321 | tests_test_array_sorted_DEPENDENCIES = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) | 321 | tests_test_array_sorted_DEPENDENCIES = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) |
| 322 | tests_test_array_sorted_LDADD = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) | 322 | tests_test_array_sorted_LDADD = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) |
| 323 | tests_test_array_sorted_SOURCES = include/tinyrad.h \ | 323 | tests_test_array_sorted_SOURCES = include/tinyrad.h \ |
| 324 | include/tinyrad_common.h \ | 324 | include/tinyrad_internal.h \ |
| 325 | include/tinyrad_compat.h \ | 325 | include/tinyrad_compat.h \ |
| 326 | tests/common.c tests/common.h \ | 326 | tests/common.c tests/common.h \ |
| 327 | tests/test-array-sorted.c | 327 | tests/test-array-sorted.c |
| @@ -331,7 +331,7 @@ tests_test_array_sorted_SOURCES = include/tinyrad.h \ | |||
| 331 | tests_test_array_stack_DEPENDENCIES = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) | 331 | tests_test_array_stack_DEPENDENCIES = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) |
| 332 | tests_test_array_stack_LDADD = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) | 332 | tests_test_array_stack_LDADD = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) |
| 333 | tests_test_array_stack_SOURCES = include/tinyrad.h \ | 333 | tests_test_array_stack_SOURCES = include/tinyrad.h \ |
| 334 | include/tinyrad_common.h \ | 334 | include/tinyrad_internal.h \ |
| 335 | include/tinyrad_compat.h \ | 335 | include/tinyrad_compat.h \ |
| 336 | tests/common.c tests/common.h \ | 336 | tests/common.c tests/common.h \ |
| 337 | tests/test-array-stack.c | 337 | tests/test-array-stack.c |
| @@ -341,7 +341,7 @@ tests_test_array_stack_SOURCES = include/tinyrad.h \ | |||
| 341 | tests_test_array_queue_DEPENDENCIES = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) | 341 | tests_test_array_queue_DEPENDENCIES = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) |
| 342 | tests_test_array_queue_LDADD = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) | 342 | tests_test_array_queue_LDADD = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) |
| 343 | tests_test_array_queue_SOURCES = include/tinyrad.h \ | 343 | tests_test_array_queue_SOURCES = include/tinyrad.h \ |
| 344 | include/tinyrad_common.h \ | 344 | include/tinyrad_internal.h \ |
| 345 | include/tinyrad_compat.h \ | 345 | include/tinyrad_compat.h \ |
| 346 | tests/common.c tests/common.h \ | 346 | tests/common.c tests/common.h \ |
| 347 | tests/test-array-queue.c | 347 | tests/test-array-queue.c |
| @@ -351,7 +351,7 @@ tests_test_array_queue_SOURCES = include/tinyrad.h \ | |||
| 351 | tests_test_dict_attrs_DEPENDENCIES = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) | 351 | tests_test_dict_attrs_DEPENDENCIES = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) |
| 352 | tests_test_dict_attrs_LDADD = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) | 352 | tests_test_dict_attrs_LDADD = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) |
| 353 | tests_test_dict_attrs_SOURCES = include/tinyrad.h \ | 353 | tests_test_dict_attrs_SOURCES = include/tinyrad.h \ |
| 354 | include/tinyrad_common.h \ | 354 | include/tinyrad_internal.h \ |
| 355 | include/tinyrad_compat.h \ | 355 | include/tinyrad_compat.h \ |
| 356 | tests/common.c tests/common.h \ | 356 | tests/common.c tests/common.h \ |
| 357 | tests/dict-data.c tests/dict-data.h \ | 357 | tests/dict-data.c tests/dict-data.h \ |
| @@ -362,7 +362,7 @@ tests_test_dict_attrs_SOURCES = include/tinyrad.h \ | |||
| 362 | tests_test_dict_values_DEPENDENCIES = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) | 362 | tests_test_dict_values_DEPENDENCIES = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) |
| 363 | tests_test_dict_values_LDADD = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) | 363 | tests_test_dict_values_LDADD = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) |
| 364 | tests_test_dict_values_SOURCES = include/tinyrad.h \ | 364 | tests_test_dict_values_SOURCES = include/tinyrad.h \ |
| 365 | include/tinyrad_common.h \ | 365 | include/tinyrad_internal.h \ |
| 366 | include/tinyrad_compat.h \ | 366 | include/tinyrad_compat.h \ |
| 367 | tests/common.c tests/common.h \ | 367 | tests/common.c tests/common.h \ |
| 368 | tests/dict-data.c tests/dict-data.h \ | 368 | tests/dict-data.c tests/dict-data.h \ |
| @@ -373,7 +373,7 @@ tests_test_dict_values_SOURCES = include/tinyrad.h \ | |||
| 373 | tests_test_dict_vendors_DEPENDENCIES = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) | 373 | tests_test_dict_vendors_DEPENDENCIES = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) |
| 374 | tests_test_dict_vendors_LDADD = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) | 374 | tests_test_dict_vendors_LDADD = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) |
| 375 | tests_test_dict_vendors_SOURCES = include/tinyrad.h \ | 375 | tests_test_dict_vendors_SOURCES = include/tinyrad.h \ |
| 376 | include/tinyrad_common.h \ | 376 | include/tinyrad_internal.h \ |
| 377 | include/tinyrad_compat.h \ | 377 | include/tinyrad_compat.h \ |
| 378 | tests/common.c tests/common.h \ | 378 | tests/common.c tests/common.h \ |
| 379 | tests/dict-data.c tests/dict-data.h \ | 379 | tests/dict-data.c tests/dict-data.h \ |
| @@ -384,7 +384,7 @@ tests_test_dict_vendors_SOURCES = include/tinyrad.h \ | |||
| 384 | tests_test_options_DEPENDENCIES = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) | 384 | tests_test_options_DEPENDENCIES = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) |
| 385 | tests_test_options_LDADD = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) | 385 | tests_test_options_LDADD = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) |
| 386 | tests_test_options_SOURCES = include/tinyrad.h \ | 386 | tests_test_options_SOURCES = include/tinyrad.h \ |
| 387 | include/tinyrad_common.h \ | 387 | include/tinyrad_internal.h \ |
| 388 | include/tinyrad_compat.h \ | 388 | include/tinyrad_compat.h \ |
| 389 | tests/common.c tests/common.h \ | 389 | tests/common.c tests/common.h \ |
| 390 | tests/test-options.c | 390 | tests/test-options.c |
| @@ -394,7 +394,7 @@ tests_test_options_SOURCES = include/tinyrad.h \ | |||
| 394 | tests_test_url_desc2str_DEPENDENCIES = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) | 394 | tests_test_url_desc2str_DEPENDENCIES = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) |
| 395 | tests_test_url_desc2str_LDADD = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) | 395 | tests_test_url_desc2str_LDADD = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) |
| 396 | tests_test_url_desc2str_SOURCES = include/tinyrad.h \ | 396 | tests_test_url_desc2str_SOURCES = include/tinyrad.h \ |
| 397 | include/tinyrad_common.h \ | 397 | include/tinyrad_internal.h \ |
| 398 | include/tinyrad_compat.h \ | 398 | include/tinyrad_compat.h \ |
| 399 | tests/common.c tests/common.h \ | 399 | tests/common.c tests/common.h \ |
| 400 | tests/test-url-desc2str.c | 400 | tests/test-url-desc2str.c |
| @@ -404,7 +404,7 @@ tests_test_url_desc2str_SOURCES = include/tinyrad.h \ | |||
| 404 | tests_test_url_parse_DEPENDENCIES = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) | 404 | tests_test_url_parse_DEPENDENCIES = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) |
| 405 | tests_test_url_parse_LDADD = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) | 405 | tests_test_url_parse_LDADD = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) |
| 406 | tests_test_url_parse_SOURCES = include/tinyrad.h \ | 406 | tests_test_url_parse_SOURCES = include/tinyrad.h \ |
| 407 | include/tinyrad_common.h \ | 407 | include/tinyrad_internal.h \ |
| 408 | include/tinyrad_compat.h \ | 408 | include/tinyrad_compat.h \ |
| 409 | tests/common.c tests/common.h \ | 409 | tests/common.c tests/common.h \ |
| 410 | tests/test-url-parse.c | 410 | tests/test-url-parse.c |
| @@ -414,7 +414,7 @@ tests_test_url_parse_SOURCES = include/tinyrad.h \ | |||
| 414 | tests_test_url_resolve_DEPENDENCIES = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) | 414 | tests_test_url_resolve_DEPENDENCIES = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) |
| 415 | tests_test_url_resolve_LDADD = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) | 415 | tests_test_url_resolve_LDADD = $(lib_LTLIBRARIES) $(noinst_LIBRARIES) |
| 416 | tests_test_url_resolve_SOURCES = include/tinyrad.h \ | 416 | tests_test_url_resolve_SOURCES = include/tinyrad.h \ |
| 417 | include/tinyrad_common.h \ | 417 | include/tinyrad_internal.h \ |
| 418 | include/tinyrad_compat.h \ | 418 | include/tinyrad_compat.h \ |
| 419 | tests/common.c tests/common.h \ | 419 | tests/common.c tests/common.h \ |
| 420 | tests/test-url-resolve.c | 420 | tests/test-url-resolve.c |
diff --git a/include/tinyrad_common.h b/include/tinyrad_internal.h index 36359c2..71b237f 100644 --- a/include/tinyrad_common.h +++ b/include/tinyrad_internal.h | |||
| @@ -28,8 +28,8 @@ | |||
| 28 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | 28 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
| 29 | * SUCH DAMAGE. | 29 | * SUCH DAMAGE. |
| 30 | */ | 30 | */ |
| 31 | #ifndef __TINYRAD_COMMON_H | 31 | #ifndef __TINYRAD_INTERNAL_H |
| 32 | #define __TINYRAD_COMMON_H 1 | 32 | #define __TINYRAD_INTERNAL_H 1 |
| 33 | 33 | ||
| 34 | 34 | ||
| 35 | /////////////// | 35 | /////////////// |
diff --git a/lib/libtinyrad/libtinyrad.h b/lib/libtinyrad/libtinyrad.h index c8dea81..eb4fb4e 100644 --- a/lib/libtinyrad/libtinyrad.h +++ b/lib/libtinyrad/libtinyrad.h | |||
| @@ -52,7 +52,7 @@ | |||
| 52 | #include <stdarg.h> | 52 | #include <stdarg.h> |
| 53 | 53 | ||
| 54 | #include <tinyrad.h> | 54 | #include <tinyrad.h> |
| 55 | #include <tinyrad_common.h> | 55 | #include <tinyrad_internal.h> |
| 56 | 56 | ||
| 57 | 57 | ||
| 58 | ////////////// | 58 | ////////////// |
diff --git a/src/common.h b/src/common.h index d471b7e..000e8f8 100644 --- a/src/common.h +++ b/src/common.h | |||
| @@ -46,7 +46,7 @@ | |||
| 46 | #endif | 46 | #endif |
| 47 | 47 | ||
| 48 | #include <tinyrad.h> | 48 | #include <tinyrad.h> |
| 49 | #include <tinyrad_common.h> | 49 | #include <tinyrad_internal.h> |
| 50 | 50 | ||
| 51 | 51 | ||
| 52 | /////////////////// | 52 | /////////////////// |
diff --git a/tests/common.h b/tests/common.h index a56800d..62223af 100644 --- a/tests/common.h +++ b/tests/common.h | |||
| @@ -46,7 +46,7 @@ | |||
| 46 | #endif | 46 | #endif |
| 47 | 47 | ||
| 48 | #include <tinyrad.h> | 48 | #include <tinyrad.h> |
| 49 | #include <tinyrad_common.h> | 49 | #include <tinyrad_internal.h> |
| 50 | 50 | ||
| 51 | 51 | ||
| 52 | /////////////////// | 52 | /////////////////// |
diff --git a/tests/dict-data.h b/tests/dict-data.h index ad3f68c..e54659b 100644 --- a/tests/dict-data.h +++ b/tests/dict-data.h | |||
| @@ -48,7 +48,7 @@ | |||
| 48 | #include <stddef.h> | 48 | #include <stddef.h> |
| 49 | 49 | ||
| 50 | #include <tinyrad.h> | 50 | #include <tinyrad.h> |
| 51 | #include <tinyrad_common.h> | 51 | #include <tinyrad_internal.h> |
| 52 | 52 | ||
| 53 | 53 | ||
| 54 | /////////////////// | 54 | /////////////////// |
