diff options
author | Christian Grothoff <christian@grothoff.org> | 2019-02-21 11:58:05 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2019-02-21 11:58:05 +0100 |
commit | ebaa4fac0cfc3ae3a00140474c38b1e0b3b53178 (patch) | |
tree | 55d83f9540510c30980673325e8e517091e8c75a /src/rps/rps-test_util.c | |
parent | d58328bbdf7924f8ea74fbdf23d4972c8b7b4d46 (diff) | |
download | gnunet-ebaa4fac0cfc3ae3a00140474c38b1e0b3b53178.tar.gz gnunet-ebaa4fac0cfc3ae3a00140474c38b1e0b3b53178.zip |
fix uninit issue: bad use of hash map
Diffstat (limited to 'src/rps/rps-test_util.c')
-rw-r--r-- | src/rps/rps-test_util.c | 53 |
1 files changed, 23 insertions, 30 deletions
diff --git a/src/rps/rps-test_util.c b/src/rps/rps-test_util.c index 3a482c1e6..85829f247 100644 --- a/src/rps/rps-test_util.c +++ b/src/rps/rps-test_util.c | |||
@@ -74,49 +74,42 @@ static struct GNUNET_CONTAINER_MultiHashMap *open_files; | |||
74 | struct GNUNET_DISK_FileHandle * | 74 | struct GNUNET_DISK_FileHandle * |
75 | get_file_handle (const char *name) | 75 | get_file_handle (const char *name) |
76 | { | 76 | { |
77 | struct GNUNET_HashCode hash = {0}; | 77 | struct GNUNET_HashCode hash; |
78 | struct GNUNET_DISK_FileHandle *fh; | 78 | struct GNUNET_DISK_FileHandle *fh; |
79 | 79 | ||
80 | if (NULL == open_files) | 80 | if (NULL == open_files) |
81 | { | 81 | { |
82 | open_files = GNUNET_CONTAINER_multihashmap_create (16, | 82 | open_files = GNUNET_CONTAINER_multihashmap_create (16, |
83 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY); | 83 | GNUNET_NO); |
84 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 84 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
85 | "Created map of open files.\n"); | 85 | "Created map of open files.\n"); |
86 | } | 86 | } |
87 | GNUNET_CRYPTO_hash (name, | 87 | GNUNET_CRYPTO_hash (name, |
88 | strnlen (name, | 88 | strlen (name), |
89 | 512), | ||
90 | &hash); | 89 | &hash); |
91 | if (GNUNET_NO == GNUNET_CONTAINER_multihashmap_contains (open_files, | 90 | if (NULL != (fh = GNUNET_CONTAINER_multihashmap_get (open_files, |
92 | &hash)) | 91 | &hash))) |
93 | { | ||
94 | fh = GNUNET_DISK_file_open (name, | ||
95 | GNUNET_DISK_OPEN_WRITE | | ||
96 | GNUNET_DISK_OPEN_CREATE | | ||
97 | GNUNET_DISK_OPEN_APPEND, | ||
98 | GNUNET_DISK_PERM_USER_READ | | ||
99 | GNUNET_DISK_PERM_USER_WRITE | | ||
100 | GNUNET_DISK_PERM_GROUP_READ); | ||
101 | if (NULL == fh) | ||
102 | { | ||
103 | LOG (GNUNET_ERROR_TYPE_ERROR, | ||
104 | "Opening file `%s' failed.\n", | ||
105 | name); | ||
106 | GNUNET_assert (0); | ||
107 | } | ||
108 | GNUNET_CONTAINER_multihashmap_put (open_files, | ||
109 | &hash, | ||
110 | fh, | ||
111 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY); | ||
112 | return fh; | 92 | return fh; |
113 | } | 93 | fh = GNUNET_DISK_file_open (name, |
114 | else | 94 | GNUNET_DISK_OPEN_WRITE | |
95 | GNUNET_DISK_OPEN_CREATE | | ||
96 | GNUNET_DISK_OPEN_APPEND, | ||
97 | GNUNET_DISK_PERM_USER_READ | | ||
98 | GNUNET_DISK_PERM_USER_WRITE | | ||
99 | GNUNET_DISK_PERM_GROUP_READ); | ||
100 | if (NULL == fh) | ||
115 | { | 101 | { |
116 | fh = GNUNET_CONTAINER_multihashmap_get (open_files, | 102 | LOG (GNUNET_ERROR_TYPE_ERROR, |
117 | &hash); | 103 | "Opening file `%s' failed.\n", |
118 | return fh; | 104 | name); |
105 | GNUNET_assert (0); | ||
119 | } | 106 | } |
107 | GNUNET_assert (GNUNET_YES == | ||
108 | GNUNET_CONTAINER_multihashmap_put (open_files, | ||
109 | &hash, | ||
110 | fh, | ||
111 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); | ||
112 | return fh; | ||
120 | } | 113 | } |
121 | 114 | ||
122 | 115 | ||