[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r22893 - gnunet/src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r22893 - gnunet/src/transport |
Date: |
Wed, 25 Jul 2012 10:46:49 +0200 |
Author: grothoff
Date: 2012-07-25 10:46:49 +0200 (Wed, 25 Jul 2012)
New Revision: 22893
Modified:
gnunet/src/transport/gnunet-transport-certificate-creation.c
Log:
-check return values
Modified: gnunet/src/transport/gnunet-transport-certificate-creation.c
===================================================================
--- gnunet/src/transport/gnunet-transport-certificate-creation.c
2012-07-25 08:43:49 UTC (rev 22892)
+++ gnunet/src/transport/gnunet-transport-certificate-creation.c
2012-07-25 08:46:49 UTC (rev 22893)
@@ -22,7 +22,6 @@
* @file transport/gnunet-transport-certificate-creation.c
* @brief create certificate for HTTPS transport
* @author LRN
- *
*/
#include "platform.h"
#include "gnunet_disk_lib.h"
@@ -32,15 +31,19 @@
static void
removecerts (const char *file1, const char *file2)
{
- if (GNUNET_DISK_file_test (file1) == GNUNET_YES)
+ if (GNUNET_YES == GNUNET_DISK_file_test (file1))
{
- CHMOD (file1, S_IWUSR | S_IRUSR);
- REMOVE (file1);
+ if (0 != CHMOD (file1, S_IWUSR | S_IRUSR))
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "chmod", file1);
+ if (0 != REMOVE (file1))
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "remove", file1);
}
- if (GNUNET_DISK_file_test (file2) == GNUNET_YES)
+ if (GNUNET_YES == GNUNET_DISK_file_test (file2))
{
- CHMOD (file2, S_IWUSR | S_IRUSR);
- REMOVE (file2);
+ if (0 != CHMOD (file2, S_IWUSR | S_IRUSR))
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "chmod", file2);
+ if (0 != REMOVE (file2))
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "remove", file2);
}
}
@@ -50,7 +53,7 @@
{
struct GNUNET_OS_Process *openssl;
- if (argc != 3)
+ if (3 != argc)
return 1;
removecerts (argv[1], argv[2]);
(void) close (2); /* eliminate stderr */
@@ -59,9 +62,9 @@
openssl =
GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
NULL, NULL, "openssl", "openssl", "genrsa",
"-out", argv[1], "1024", NULL);
- if (openssl == NULL)
+ if (NULL == openssl)
return 2;
- GNUNET_assert (GNUNET_OS_process_wait (openssl) == GNUNET_OK);
+ GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (openssl));
GNUNET_OS_process_destroy (openssl);
/* Create a self-signed certificate in batch mode using rsa key */
@@ -70,12 +73,14 @@
GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
NULL, NULL, "openssl", "openssl", "req",
"-batch", "-days", "365", "-out", argv[2],
"-new", "-x509", "-key", argv[1], NULL);
- if (openssl == NULL)
+ if (NULL == openssl)
return 3;
- GNUNET_assert (GNUNET_OS_process_wait (openssl) == GNUNET_OK);
+ GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (openssl));
GNUNET_OS_process_destroy (openssl);
- CHMOD (argv[1], S_IRUSR);
- CHMOD (argv[2], S_IRUSR);
+ if (0 != CHMOD (argv[1], S_IRUSR))
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "chmod", argv[1]);
+ if (0 != CHMOD (argv[2], S_IRUSR))
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "chmod", argv[2]);
return 0;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r22893 - gnunet/src/transport,
gnunet <=