← Back to branch summary

~ubuntu-branches/ubuntu/raring/curl/raring-updates

« back to all changes in this revision

Viewing changes to lib/sslgen.c

  • Committer: Package Import Robot
  • Author(s): Alessandro Ghedini
  • Date: 2011-11-13 21:07:32 UTC
  • mto: (3.6.1 experimental) (1.3.1)
  • mto: This revision was merged to the branch mainline in revision 55.
  • Revision ID: package-import@ubuntu.com-20111113210732-bk5n25x2tu7aplur
Tags: upstream-7.22.0
Import upstream version 7.22.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/sslgen.c
43
43
 
44
44
#include "setup.h"
45
45
 
46
 
#include <string.h>
47
 
#include <stdlib.h>
48
 
#include <ctype.h>
49
46
#ifdef HAVE_SYS_SOCKET_H
50
47
#include <sys/socket.h>
51
48
#endif
72
69
{
73
70
  if(str1 && str2)
74
71
    /* both pointers point to something then compare them */
75
 
    return (bool)(0 != Curl_raw_equal(str1, str2));
 
72
    return (0 != Curl_raw_equal(str1, str2)) ? TRUE : FALSE;
76
73
  else
77
74
    /* if both pointers are NULL then treat them as equal */
78
 
    return (bool)(!str1 && !str2);
 
75
    return (!str1 && !str2) ? TRUE : FALSE;
79
76
}
80
77
 
81
78
bool
213
210
  /* mark this is being ssl requested from here on. */
214
211
  conn->ssl[sockindex].use = TRUE;
215
212
  res = curlssl_connect_nonblocking(conn, sockindex, done);
216
 
  if(!res && *done == TRUE)
 
213
  if(!res && *done)
217
214
    Curl_pgrsTime(conn->data, TIMER_APPCONNECT); /* SSL is connected */
218
215
  return res;
219
216
#else