diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-04-01 07:56:13 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-04-01 07:56:13 +0000 |
commit | b02e7ec363ef07b22a96bc63e5edf79e0f2316ad (patch) | |
tree | 7b05c1ff656a635aaa6b27a1cff8c7f384dd3063 /src | |
parent | bbe279c1183a26f486bd43c1b6ad3243de983774 (diff) | |
download | gnunet-b02e7ec363ef07b22a96bc63e5edf79e0f2316ad.tar.gz gnunet-b02e7ec363ef07b22a96bc63e5edf79e0f2316ad.zip |
renaming gnunet-core-list-connections to gnunet-core, adding man page
Diffstat (limited to 'src')
-rw-r--r-- | src/core/Makefile.am | 12 | ||||
-rw-r--r-- | src/core/gnunet-core.c (renamed from src/core/gnunet-core-list-connections.c) | 0 | ||||
-rw-r--r-- | src/include/gnunet_fs_service.h | 6 |
3 files changed, 10 insertions, 8 deletions
diff --git a/src/core/Makefile.am b/src/core/Makefile.am index ad9bddcb6..b79b6cc6a 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am | |||
@@ -31,7 +31,7 @@ libgnunetcore_la_LDFLAGS = \ | |||
31 | 31 | ||
32 | bin_PROGRAMS = \ | 32 | bin_PROGRAMS = \ |
33 | gnunet-service-core \ | 33 | gnunet-service-core \ |
34 | gnunet-core-list-connections | 34 | gnunet-core |
35 | 35 | ||
36 | gnunet_service_core_SOURCES = \ | 36 | gnunet_service_core_SOURCES = \ |
37 | gnunet-service-core.c gnunet-service-core.h \ | 37 | gnunet-service-core.c gnunet-service-core.h \ |
@@ -49,14 +49,12 @@ gnunet_service_core_LDADD = \ | |||
49 | $(GN_LIBINTL) -lz | 49 | $(GN_LIBINTL) -lz |
50 | 50 | ||
51 | 51 | ||
52 | gnunet_core_list_connections_SOURCES = \ | 52 | gnunet_core_SOURCES = \ |
53 | gnunet-core-list-connections.c | 53 | gnunet-core.c |
54 | gnunet_core_list_connections_LDADD = \ | 54 | gnunet_core_LDADD = \ |
55 | $(top_builddir)/src/core/libgnunetcore.la \ | 55 | $(top_builddir)/src/core/libgnunetcore.la \ |
56 | $(top_builddir)/src/transport/libgnunettransport.la \ | ||
57 | $(top_builddir)/src/hello/libgnunethello.la \ | ||
58 | $(top_builddir)/src/util/libgnunetutil.la | 56 | $(top_builddir)/src/util/libgnunetutil.la |
59 | gnunet_core_list_connections_DEPENDENCIES = \ | 57 | gnunet_core_DEPENDENCIES = \ |
60 | libgnunetcore.la | 58 | libgnunetcore.la |
61 | 59 | ||
62 | check_PROGRAMS = \ | 60 | check_PROGRAMS = \ |
diff --git a/src/core/gnunet-core-list-connections.c b/src/core/gnunet-core.c index 4fe0a4f86..4fe0a4f86 100644 --- a/src/core/gnunet-core-list-connections.c +++ b/src/core/gnunet-core.c | |||
diff --git a/src/include/gnunet_fs_service.h b/src/include/gnunet_fs_service.h index 3eb58921a..1f1e60f0f 100644 --- a/src/include/gnunet_fs_service.h +++ b/src/include/gnunet_fs_service.h | |||
@@ -1820,7 +1820,11 @@ GNUNET_FS_file_information_create_from_data (struct GNUNET_FS_Handle *h, | |||
1820 | * @param cls closure | 1820 | * @param cls closure |
1821 | * @param offset offset to read from; it is possible | 1821 | * @param offset offset to read from; it is possible |
1822 | * that the caller might need to go backwards | 1822 | * that the caller might need to go backwards |
1823 | * a bit at times | 1823 | * a bit at times; set to UINT64_MAX to tell |
1824 | * the reader that we won't be reading for a while | ||
1825 | * (used to close the file descriptor but NOT fully | ||
1826 | * clean up the reader's state); in this case, | ||
1827 | * a value of '0' for max should be ignored | ||
1824 | * @param max maximum number of bytes that should be | 1828 | * @param max maximum number of bytes that should be |
1825 | * copied to buf; readers are not allowed | 1829 | * copied to buf; readers are not allowed |
1826 | * to provide less data unless there is an error; | 1830 | * to provide less data unless there is an error; |