Mercurial > hg > octave-jordi

comparison libinterp/corefcn/urlwrite.cc @ 20981:d27f66b4b8e6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: invert if/else/error instances. * oct-map.cc, oct-stream.cc, sparse-xpow.cc, symtab.h, typecast.cc, urlwrite.cc: Invert if/else/error instances.
author John W. Eaton <jwe@octave.org>
date Fri, 25 Dec 2015 00:48:01 -0500
parents a4f5da7c5463
children 936b88598a0b
comparison
equal deleted inserted replaced
20980:c11cea70b638 20981:d27f66b4b8e6
183 { 183 {
184 curl_handle h = get_handle (); 184 curl_handle h = get_handle ();
185 185
186 url_transfer obj (host, user, passwd, os); 186 url_transfer obj (host, user, passwd, os);
187 187
188 if (obj.is_valid ()) 188 if (! obj.is_valid ())
189 handle_map[h] = obj;
190 else
191 error ("support for URL transfers was disabled when Octave was built"); 189 error ("support for URL transfers was disabled when Octave was built");
190
191 handle_map[h] = obj;
192 192
193 return h; 193 return h;
194 } 194 }
195 195
196 Matrix do_handle_list (void) 196 Matrix do_handle_list (void)
257 { 257 {
258 if (h.ok ()) 258 if (h.ok ())
259 { 259 {
260 iterator p = handle_map.find (h); 260 iterator p = handle_map.find (h);
261 261
262 if (p != handle_map.end ()) 262 if (p == handle_map.end ())
263 {
264 // Curl handles are negative integers plus some random
265 // fractional part. To avoid running out of integers, we
266 // recycle the integer part but tack on a new random part
267 // each time.
268
269 handle_map.erase (p);
270
271 if (h.value () < 0)
272 handle_free_list.insert
273 (std::ceil (h.value ()) - make_handle_fraction ());
274 }
275 else
276 error ("ch_manager::free: invalid object %g", h.value ()); 263 error ("ch_manager::free: invalid object %g", h.value ());
264
265 // Curl handles are negative integers plus some random
266 // fractional part. To avoid running out of integers, we
267 // recycle the integer part but tack on a new random part
268 // each time.
269
270 handle_map.erase (p);
271
272 if (h.value () < 0)
273 handle_free_list.insert
274 (std::ceil (h.value ()) - make_handle_fraction ());
277 } 275 }
278 } 276 }
279 277
280 ch_manager *ch_manager::instance = 0; 278 ch_manager *ch_manager::instance = 0;
281 279