projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
-try with finished
[oweals/gnunet.git]
/
src
/
util
/
bio.c
diff --git
a/src/util/bio.c
b/src/util/bio.c
index b29d75eb9e0988b5a51491a617c6d5e03bddf16a..053b8e1cafd5f78cd787a4cde0e224719b1297d7 100644
(file)
--- a/
src/util/bio.c
+++ b/
src/util/bio.c
@@
-26,6
+26,8
@@
#include "gnunet_bio_lib.h"
#include "gnunet_disk_lib.h"
#include "gnunet_bio_lib.h"
#include "gnunet_disk_lib.h"
+#define LOG(kind,...) GNUNET_log_from (kind, "util",__VA_ARGS__)
+
#define BIO_BUFFER_SIZE 65536
#define MAX_META_DATA (1024 * 1024)
#define BIO_BUFFER_SIZE 65536
#define MAX_META_DATA (1024 * 1024)
@@
-101,8
+103,8
@@
GNUNET_BIO_read_close (struct GNUNET_BIO_ReadHandle *h, char **emsg)
* @return GNUNET_OK on success, GNUNET_SYSERR on failure
*/
int
* @return GNUNET_OK on success, GNUNET_SYSERR on failure
*/
int
-GNUNET_BIO_read (struct GNUNET_BIO_ReadHandle *h,
-
const char *what,
void *result, size_t len)
+GNUNET_BIO_read (struct GNUNET_BIO_ReadHandle *h,
const char *what,
+ void *result, size_t len)
{
char *dst = result;
size_t min;
{
char *dst = result;
size_t min;
@@
-131,14
+133,14
@@
GNUNET_BIO_read (struct GNUNET_BIO_ReadHandle *h,
ret = GNUNET_DISK_file_read (h->fd, h->buffer, h->size);
if (ret == -1)
{
ret = GNUNET_DISK_file_read (h->fd, h->buffer, h->size);
if (ret == -1)
{
- GNUNET_asprintf (&h->emsg,
-
_("Error reading `%s': %s"), what,
STRERROR (errno));
+ GNUNET_asprintf (&h->emsg,
_("Error reading `%s': %s"), what,
+ STRERROR (errno));
return GNUNET_SYSERR;
}
if (ret == 0)
{
return GNUNET_SYSERR;
}
if (ret == 0)
{
- GNUNET_asprintf (&h->emsg,
- _("E
rror reading `%s': %s"), what, _("E
nd of file"));
+ GNUNET_asprintf (&h->emsg,
_("Error reading `%s': %s"), what,
+ _("End of file"));
return GNUNET_SYSERR;
}
h->pos = 0;
return GNUNET_SYSERR;
}
h->pos = 0;
@@
-160,8
+162,8
@@
GNUNET_BIO_read (struct GNUNET_BIO_ReadHandle *h,
* @return GNUNET_OK on success, GNUNET_SYSERR on failure
*/
int
* @return GNUNET_OK on success, GNUNET_SYSERR on failure
*/
int
-GNUNET_BIO_read_fn (struct GNUNET_BIO_ReadHandle *h,
-
const char *file, int line,
void *result, size_t len)
+GNUNET_BIO_read_fn (struct GNUNET_BIO_ReadHandle *h,
const char *file, int line,
+ void *result, size_t len)
{
char what[1024];
{
char what[1024];
@@
-181,8
+183,8
@@
GNUNET_BIO_read_fn (struct GNUNET_BIO_ReadHandle *h,
* @return GNUNET_OK on success, GNUNET_SYSERR on failure
*/
int
* @return GNUNET_OK on success, GNUNET_SYSERR on failure
*/
int
-GNUNET_BIO_read_string (struct GNUNET_BIO_ReadHandle *h,
- c
onst char *what, c
har **result, size_t maxLen)
+GNUNET_BIO_read_string (struct GNUNET_BIO_ReadHandle *h,
const char *what,
+ char **result, size_t maxLen)
{
char *buf;
uint32_t big;
{
char *buf;
uint32_t big;
@@
-200,8
+202,7
@@
GNUNET_BIO_read_string (struct GNUNET_BIO_ReadHandle *h,
}
if (big > maxLen)
{
}
if (big > maxLen)
{
- GNUNET_asprintf (&h->emsg,
- _("String `%s' longer than allowed (%u > %u)"),
+ GNUNET_asprintf (&h->emsg, _("String `%s' longer than allowed (%u > %u)"),
what, big, maxLen);
return GNUNET_SYSERR;
}
what, big, maxLen);
return GNUNET_SYSERR;
}
@@
-229,8
+230,7
@@
GNUNET_BIO_read_string (struct GNUNET_BIO_ReadHandle *h,
* @return GNUNET_OK on success, GNUNET_SYSERR on failure
*/
int
* @return GNUNET_OK on success, GNUNET_SYSERR on failure
*/
int
-GNUNET_BIO_read_meta_data (struct GNUNET_BIO_ReadHandle *h,
- const char *what,
+GNUNET_BIO_read_meta_data (struct GNUNET_BIO_ReadHandle *h, const char *what,
struct GNUNET_CONTAINER_MetaData **result)
{
uint32_t size;
struct GNUNET_CONTAINER_MetaData **result)
{
uint32_t size;
@@
-280,8
+280,8
@@
GNUNET_BIO_read_meta_data (struct GNUNET_BIO_ReadHandle *h,
* @return GNUNET_OK on success, GNUNET_SYSERR on error
*/
int
* @return GNUNET_OK on success, GNUNET_SYSERR on error
*/
int
-GNUNET_BIO_read_int32__ (struct GNUNET_BIO_ReadHandle *h,
-
const char *file,
int line, int32_t * i)
+GNUNET_BIO_read_int32__ (struct GNUNET_BIO_ReadHandle *h,
const char *file,
+ int line, int32_t * i)
{
int32_t big;
{
int32_t big;
@@
-302,8
+302,8
@@
GNUNET_BIO_read_int32__ (struct GNUNET_BIO_ReadHandle *h,
* @return GNUNET_OK on success, GNUNET_SYSERR on error
*/
int
* @return GNUNET_OK on success, GNUNET_SYSERR on error
*/
int
-GNUNET_BIO_read_int64__ (struct GNUNET_BIO_ReadHandle *h,
-
const char *file,
int line, int64_t * i)
+GNUNET_BIO_read_int64__ (struct GNUNET_BIO_ReadHandle *h,
const char *file,
+ int line, int64_t * i)
{
int64_t big;
{
int64_t big;
@@
-339,9
+339,8
@@
GNUNET_BIO_write_open (const char *fn)
struct GNUNET_BIO_WriteHandle *h;
fd = GNUNET_DISK_file_open (fn,
struct GNUNET_BIO_WriteHandle *h;
fd = GNUNET_DISK_file_open (fn,
- GNUNET_DISK_OPEN_WRITE |
- GNUNET_DISK_OPEN_TRUNCATE |
- GNUNET_DISK_OPEN_CREATE,
+ GNUNET_DISK_OPEN_WRITE | GNUNET_DISK_OPEN_TRUNCATE
+ | GNUNET_DISK_OPEN_CREATE,
GNUNET_DISK_PERM_USER_READ |
GNUNET_DISK_PERM_USER_WRITE);
if (NULL == fd)
GNUNET_DISK_PERM_USER_READ |
GNUNET_DISK_PERM_USER_WRITE);
if (NULL == fd)
@@
-394,8
+393,8
@@
GNUNET_BIO_write_close (struct GNUNET_BIO_WriteHandle *h)
* @return GNUNET_OK on success, GNUNET_SYSERR on error
*/
int
* @return GNUNET_OK on success, GNUNET_SYSERR on error
*/
int
-GNUNET_BIO_write (struct GNUNET_BIO_WriteHandle *h,
-
const void *buffer,
size_t n)
+GNUNET_BIO_write (struct GNUNET_BIO_WriteHandle *h,
const void *buffer,
+ size_t n)
{
const char *src = buffer;
size_t min;
{
const char *src = buffer;
size_t min;
@@
-470,10
+469,9
@@
GNUNET_BIO_write_meta_data (struct GNUNET_BIO_WriteHandle *h,
if (m == NULL)
return GNUNET_BIO_write_int32 (h, 0);
buf = NULL;
if (m == NULL)
return GNUNET_BIO_write_int32 (h, 0);
buf = NULL;
- size = GNUNET_CONTAINER_meta_data_serialize (m,
- &buf,
- MAX_META_DATA,
- GNUNET_CONTAINER_META_DATA_SERIALIZE_PART);
+ size =
+ GNUNET_CONTAINER_meta_data_serialize (m, &buf, MAX_META_DATA,
+ GNUNET_CONTAINER_META_DATA_SERIALIZE_PART);
if (size == -1)
{
GNUNET_free (buf);
if (size == -1)
{
GNUNET_free (buf);
@@
-494,7
+492,7
@@
GNUNET_BIO_write_meta_data (struct GNUNET_BIO_WriteHandle *h,
* Write an (u)int32_t.
*
* @param h hande to open file
* Write an (u)int32_t.
*
* @param h hande to open file
- * @param i
address of
32-bit integer to write
+ * @param i 32-bit integer to write
* @return GNUNET_OK on success, GNUNET_SYSERR on error
*/
int
* @return GNUNET_OK on success, GNUNET_SYSERR on error
*/
int
@@
-511,7
+509,7
@@
GNUNET_BIO_write_int32 (struct GNUNET_BIO_WriteHandle *h, int32_t i)
* Write an (u)int64_t.
*
* @param h hande to open file
* Write an (u)int64_t.
*
* @param h hande to open file
- * @param i
address of
64-bit integer to write
+ * @param i 64-bit integer to write
* @return GNUNET_OK on success, GNUNET_SYSERR on error
*/
int
* @return GNUNET_OK on success, GNUNET_SYSERR on error
*/
int