[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r9538 - gnunet/src/util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r9538 - gnunet/src/util |
Date: |
Sun, 15 Nov 2009 15:54:59 -0700 |
Author: jilu
Date: 2009-11-15 15:54:58 -0700 (Sun, 15 Nov 2009)
New Revision: 9538
Modified:
gnunet/src/util/pseudonym.c
Log:
tiny thing
Modified: gnunet/src/util/pseudonym.c
===================================================================
--- gnunet/src/util/pseudonym.c 2009-11-15 22:48:05 UTC (rev 9537)
+++ gnunet/src/util/pseudonym.c 2009-11-15 22:54:58 UTC (rev 9538)
@@ -177,16 +177,19 @@
int32_t ranking, const char *ns_name)
{
char *fn;
-
+ int ret;
fn = get_data_filename (cfg, PS_METADATA_DIR, nsid);
GNUNET_assert (fn != NULL);
struct GNUNET_BIO_WriteHandle *fileW;
fileW = GNUNET_BIO_write_open(fn);
- GNUNET_assert (NULL != fileW);
- GNUNET_assert (GNUNET_OK == GNUNET_BIO_write_int32(fileW, ranking));
- GNUNET_assert (GNUNET_OK == GNUNET_BIO_write_string(fileW, ns_name));
- GNUNET_assert (GNUNET_OK == GNUNET_BIO_write_meta_data(fileW, meta));
- GNUNET_assert(GNUNET_OK == GNUNET_BIO_write_close(fileW));
+ if((NULL != fileW)&&
+ (GNUNET_OK == GNUNET_BIO_write_int32(fileW, ranking))&&
+ (GNUNET_OK == GNUNET_BIO_write_string(fileW, ns_name))&&
+ (GNUNET_OK == GNUNET_BIO_write_meta_data(fileW, meta))&&
+ (GNUNET_OK == GNUNET_BIO_write_close(fileW)))
+ ret = GNUNET_OK;
+ else
+ ret = GNUNET_SYSERR;
GNUNET_free (fn);
/* create entry for pseudonym name in names */
GNUNET_free_non_null (GNUNET_PSEUDONYM_id_to_name (cfg, nsid));
@@ -204,18 +207,21 @@
{
char *fn;
char *emsg;
-
+ int ret;
fn = get_data_filename (cfg, PS_METADATA_DIR, nsid);
GNUNET_assert (fn != NULL);
struct GNUNET_BIO_ReadHandle *fileR;
fileR = GNUNET_BIO_read_open(fn);
- GNUNET_assert (NULL != fileR);
- GNUNET_assert (GNUNET_OK == GNUNET_BIO_read_int32__(fileR, "Read int32
error!", ranking));
- GNUNET_assert (GNUNET_OK == GNUNET_BIO_read_string(fileR, "Read string
error!", ns_name, 200));
- GNUNET_assert (GNUNET_OK == GNUNET_BIO_read_meta_data(fileR, "Read meta data
error!", meta));
- GNUNET_assert(GNUNET_OK == GNUNET_BIO_read_close(fileR, &emsg));
+ if((NULL != fileR)&&
+ (GNUNET_OK == GNUNET_BIO_read_int32__(fileR, "Read int32 error!",
ranking))&&
+ (GNUNET_OK == GNUNET_BIO_read_string(fileR, "Read string error!",
ns_name, 200))&&
+ (GNUNET_OK == GNUNET_BIO_read_meta_data(fileR, "Read meta data error!",
meta))&&
+ (GNUNET_OK == GNUNET_BIO_read_close(fileR, &emsg)))
+ ret = GNUNET_OK;
+ else
+ ret = GNUNET_SYSERR;
GNUNET_free (fn);
- return GNUNET_OK;
+ return ret;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r9538 - gnunet/src/util,
gnunet <=