diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-10-06 20:55:28 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-10-06 20:55:28 +0000 |
commit | 61c39c60565b386e0e12ea669556b030e8cd7180 (patch) | |
tree | 59109aeab8297bdc996faca8c4e38ec7426c36cf /src/hello | |
parent | 780eb09dd8040ecf8649d40ddf8314464e0fc48e (diff) | |
download | gnunet-61c39c60565b386e0e12ea669556b030e8cd7180.tar.gz gnunet-61c39c60565b386e0e12ea669556b030e8cd7180.zip |
-remove trailing whitespace
Diffstat (limited to 'src/hello')
-rw-r--r-- | src/hello/gnunet-hello.c | 14 | ||||
-rw-r--r-- | src/hello/hello.c | 24 |
2 files changed, 19 insertions, 19 deletions
diff --git a/src/hello/gnunet-hello.c b/src/hello/gnunet-hello.c index f96a999b8..795f4f29b 100644 --- a/src/hello/gnunet-hello.c +++ b/src/hello/gnunet-hello.c | |||
@@ -35,7 +35,7 @@ struct AddContext | |||
35 | * Where to add. | 35 | * Where to add. |
36 | */ | 36 | */ |
37 | char *buf; | 37 | char *buf; |
38 | 38 | ||
39 | /** | 39 | /** |
40 | * Maximum number of bytes left | 40 | * Maximum number of bytes left |
41 | */ | 41 | */ |
@@ -65,7 +65,7 @@ add_to_buf (void *cls, const struct GNUNET_HELLO_Address *address, | |||
65 | struct AddContext *ac = cls; | 65 | struct AddContext *ac = cls; |
66 | size_t ret; | 66 | size_t ret; |
67 | 67 | ||
68 | ret = GNUNET_HELLO_add_address (address, | 68 | ret = GNUNET_HELLO_add_address (address, |
69 | GNUNET_TIME_UNIT_FOREVER_ABS, | 69 | GNUNET_TIME_UNIT_FOREVER_ABS, |
70 | ac->buf, | 70 | ac->buf, |
71 | ac->max); | 71 | ac->max); |
@@ -97,7 +97,7 @@ add_from_hello (void *cls, size_t max, void *buf) | |||
97 | ac.max = max; | 97 | ac.max = max; |
98 | ac.ret = 0; | 98 | ac.ret = 0; |
99 | GNUNET_assert (NULL == | 99 | GNUNET_assert (NULL == |
100 | GNUNET_HELLO_iterate_addresses (*orig, | 100 | GNUNET_HELLO_iterate_addresses (*orig, |
101 | GNUNET_NO, &add_to_buf, | 101 | GNUNET_NO, &add_to_buf, |
102 | &ac)); | 102 | &ac)); |
103 | *orig = NULL; | 103 | *orig = NULL; |
@@ -145,7 +145,7 @@ main (int argc, char *argv[]) | |||
145 | argv[1]); | 145 | argv[1]); |
146 | return 1; | 146 | return 1; |
147 | } | 147 | } |
148 | fh = GNUNET_DISK_file_open (argv[1], | 148 | fh = GNUNET_DISK_file_open (argv[1], |
149 | GNUNET_DISK_OPEN_READ, | 149 | GNUNET_DISK_OPEN_READ, |
150 | GNUNET_DISK_PERM_USER_READ); | 150 | GNUNET_DISK_PERM_USER_READ); |
151 | if (NULL == fh) | 151 | if (NULL == fh) |
@@ -158,8 +158,8 @@ main (int argc, char *argv[]) | |||
158 | } | 158 | } |
159 | { | 159 | { |
160 | char buf[fsize] GNUNET_ALIGN; | 160 | char buf[fsize] GNUNET_ALIGN; |
161 | 161 | ||
162 | GNUNET_assert (fsize == | 162 | GNUNET_assert (fsize == |
163 | GNUNET_DISK_file_read (fh, buf, fsize)); | 163 | GNUNET_DISK_file_read (fh, buf, fsize)); |
164 | GNUNET_assert (GNUNET_OK == GNUNET_DISK_file_close (fh)); | 164 | GNUNET_assert (GNUNET_OK == GNUNET_DISK_file_close (fh)); |
165 | orig = (struct GNUNET_HELLO_Message *) buf; | 165 | orig = (struct GNUNET_HELLO_Message *) buf; |
@@ -174,7 +174,7 @@ main (int argc, char *argv[]) | |||
174 | result = GNUNET_HELLO_create (&pk, &add_from_hello, &orig, | 174 | result = GNUNET_HELLO_create (&pk, &add_from_hello, &orig, |
175 | GNUNET_HELLO_is_friend_only (orig)); | 175 | GNUNET_HELLO_is_friend_only (orig)); |
176 | GNUNET_assert (NULL != result); | 176 | GNUNET_assert (NULL != result); |
177 | fh = GNUNET_DISK_file_open (argv[1], | 177 | fh = GNUNET_DISK_file_open (argv[1], |
178 | GNUNET_DISK_OPEN_WRITE, | 178 | GNUNET_DISK_OPEN_WRITE, |
179 | GNUNET_DISK_PERM_USER_READ | GNUNET_DISK_PERM_USER_WRITE); | 179 | GNUNET_DISK_PERM_USER_READ | GNUNET_DISK_PERM_USER_WRITE); |
180 | if (NULL == fh) | 180 | if (NULL == fh) |
diff --git a/src/hello/hello.c b/src/hello/hello.c index 9e246d473..6261dcb6b 100644 --- a/src/hello/hello.c +++ b/src/hello/hello.c | |||
@@ -166,7 +166,7 @@ GNUNET_HELLO_add_address (const struct GNUNET_HELLO_Address *address, | |||
166 | */ | 166 | */ |
167 | static size_t | 167 | static size_t |
168 | get_hello_address_size (const char *buf, | 168 | get_hello_address_size (const char *buf, |
169 | size_t max, | 169 | size_t max, |
170 | uint16_t *ralen) | 170 | uint16_t *ralen) |
171 | { | 171 | { |
172 | const char *pos; | 172 | const char *pos; |
@@ -716,9 +716,9 @@ GNUNET_HELLO_get_last_expiration (const struct GNUNET_HELLO_Message *msg) | |||
716 | * maybe differenciated into additional subcategories if applicable. | 716 | * maybe differenciated into additional subcategories if applicable. |
717 | * This module only deals with hello identifiers (MODULE = "hello"). | 717 | * This module only deals with hello identifiers (MODULE = "hello"). |
718 | * <p> | 718 | * <p> |
719 | * | 719 | * |
720 | * The concrete URI format is: | 720 | * The concrete URI format is: |
721 | * | 721 | * |
722 | * "gnunet://hello/PEER[!YYYYMMDDHHMMSS!<TYPE>!<ADDRESS>]...". | 722 | * "gnunet://hello/PEER[!YYYYMMDDHHMMSS!<TYPE>!<ADDRESS>]...". |
723 | * These URIs can be used to add a peer record to peerinfo service. | 723 | * These URIs can be used to add a peer record to peerinfo service. |
724 | * PEER is the string representation of peer's public key. | 724 | * PEER is the string representation of peer's public key. |
@@ -726,29 +726,29 @@ GNUNET_HELLO_get_last_expiration (const struct GNUNET_HELLO_Message *msg) | |||
726 | * TYPE is a transport type. | 726 | * TYPE is a transport type. |
727 | * ADDRESS is the address, its format depends upon the transport type. | 727 | * ADDRESS is the address, its format depends upon the transport type. |
728 | * The concrete transport types and corresponding address formats are: | 728 | * The concrete transport types and corresponding address formats are: |
729 | * | 729 | * |
730 | * <ul><li> | 730 | * <ul><li> |
731 | * | 731 | * |
732 | * <TCP|UDP>!IPADDRESS | 732 | * <TCP|UDP>!IPADDRESS |
733 | * IPVDDRESS is either IPV4 .-delimited address in form of XXX.XXX.XXX.XXX:PPPPP | 733 | * IPVDDRESS is either IPV4 .-delimited address in form of XXX.XXX.XXX.XXX:PPPPP |
734 | * or IPV6 :-delimited address, but with '(' and ')' instead of '[' and ']' (RFC2396 advises against using square brackets in URIs): | 734 | * or IPV6 :-delimited address, but with '(' and ')' instead of '[' and ']' (RFC2396 advises against using square brackets in URIs): |
735 | * (XXXX:XXXX:XXXX:XXXX:XXXX:XXXX:XXXX:XXXX):PPPPP | 735 | * (XXXX:XXXX:XXXX:XXXX:XXXX:XXXX:XXXX:XXXX):PPPPP |
736 | * PPPPP is the port number. May be 0. | 736 | * PPPPP is the port number. May be 0. |
737 | * | 737 | * |
738 | * </li><li> | 738 | * </li><li> |
739 | * | 739 | * |
740 | * [add SMTP, HTTP and other addresses here] | 740 | * [add SMTP, HTTP and other addresses here] |
741 | * | 741 | * |
742 | * </li></ul> | 742 | * </li></ul> |
743 | * | 743 | * |
744 | * The encoding for hexadecimal values is defined in the crypto_hash.c | 744 | * The encoding for hexadecimal values is defined in the crypto_hash.c |
745 | * module in the gnunetutil library and discussed there. | 745 | * module in the gnunetutil library and discussed there. |
746 | * | 746 | * |
747 | * Examples: | 747 | * Examples: |
748 | * | 748 | * |
749 | * gnunet://hello/0430205UC7D56PTQK8NV05776671CNN44FK4TL6D0GQ35OMF8MEN4RNMKA5UF6AL3DQO8B1SC5AQF50SQ2MABIRU4HC8H2HAJKJ59JL1JVRJAK308F9GASRFLMGUBB5TQ5AKR94AS5T3MDG8B9O1EMPRKB0HVCG7T6QPP4CDJ913LAEHVJ2DI1TOBB15Q1JIT5ARBOD12U4SIGRFDV3Q7T66G4TBVSJJ90UQF1BG29TGJJKLGEIMSPHHKO544D6EALQ4F2K0416311JC22GVAD48R616I7VK03K7MP7N0RS2MBV1TE9JV8CK1LSQMR7KCDRTLDA6917UGA67DHTGHERIACCGQ54TGSR48RMSGS9BA5HLMOKASFC1I6V4TT09TUGCU8GNDHQF0JF3H7LPV59UL5I38QID040G000!20120302010059!TCP!192.168.0.1:2086!TCP!64.23.8.174:0 | 749 | * gnunet://hello/0430205UC7D56PTQK8NV05776671CNN44FK4TL6D0GQ35OMF8MEN4RNMKA5UF6AL3DQO8B1SC5AQF50SQ2MABIRU4HC8H2HAJKJ59JL1JVRJAK308F9GASRFLMGUBB5TQ5AKR94AS5T3MDG8B9O1EMPRKB0HVCG7T6QPP4CDJ913LAEHVJ2DI1TOBB15Q1JIT5ARBOD12U4SIGRFDV3Q7T66G4TBVSJJ90UQF1BG29TGJJKLGEIMSPHHKO544D6EALQ4F2K0416311JC22GVAD48R616I7VK03K7MP7N0RS2MBV1TE9JV8CK1LSQMR7KCDRTLDA6917UGA67DHTGHERIACCGQ54TGSR48RMSGS9BA5HLMOKASFC1I6V4TT09TUGCU8GNDHQF0JF3H7LPV59UL5I38QID040G000!20120302010059!TCP!192.168.0.1:2086!TCP!64.23.8.174:0 |
750 | * gnunet://hello/0430205UC7D56PTQK8NV05776671CNN44FK4TL6D0GQ35OMF8MEN4RNMKA5UF6AL3DQO8B1SC5AQF50SQ2MABIRU4HC8H2HAJKJ59JL1JVRJAK308F9GASRFLMGUBB5TQ5AKR94AS5T3MDG8B9O1EMPRKB0HVCG7T6QPP4CDJ913LAEHVJ2DI1TOBB15Q1JIT5ARBOD12U4SIGRFDV3Q7T66G4TBVSJJ90UQF1BG29TGJJKLGEIMSPHHKO544D6EALQ4F2K0416311JC22GVAD48R616I7VK03K7MP7N0RS2MBV1TE9JV8CK1LSQMR7KCDRTLDA6917UGA67DHTGHERIACCGQ54TGSR48RMSGS9BA5HLMOKASFC1I6V4TT09TUGCU8GNDHQF0JF3H7LPV59UL5I38QID040G000!20120302010059!TCP!(2001:db8:85a3:8d3:1319:8a2e:370:7348):2086 | 750 | * gnunet://hello/0430205UC7D56PTQK8NV05776671CNN44FK4TL6D0GQ35OMF8MEN4RNMKA5UF6AL3DQO8B1SC5AQF50SQ2MABIRU4HC8H2HAJKJ59JL1JVRJAK308F9GASRFLMGUBB5TQ5AKR94AS5T3MDG8B9O1EMPRKB0HVCG7T6QPP4CDJ913LAEHVJ2DI1TOBB15Q1JIT5ARBOD12U4SIGRFDV3Q7T66G4TBVSJJ90UQF1BG29TGJJKLGEIMSPHHKO544D6EALQ4F2K0416311JC22GVAD48R616I7VK03K7MP7N0RS2MBV1TE9JV8CK1LSQMR7KCDRTLDA6917UGA67DHTGHERIACCGQ54TGSR48RMSGS9BA5HLMOKASFC1I6V4TT09TUGCU8GNDHQF0JF3H7LPV59UL5I38QID040G000!20120302010059!TCP!(2001:db8:85a3:8d3:1319:8a2e:370:7348):2086 |
751 | * | 751 | * |
752 | * <p> | 752 | * <p> |
753 | */ | 753 | */ |
754 | 754 | ||