← Back to branch summary

~brianaker/libdrizzle/yet-more-build-updates-mingw

« back to all changes in this revision

Viewing changes to libdrizzle/handshake.cc

  • Committer: Continuous Integration
  • Date: 2013-01-05 11:52:21 UTC
  • mfrom: (79.1.5 5.1-api-fixes)
  • Revision ID: ci@drizzle.org-20130105115221-qxd0g29jljekx7q9
Merge lp:~linuxjedi/libdrizzle/5.1-api-fixes Build: jenkins-Libdrizzle-33

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle/handshake.cc
81
81
 
82
82
drizzle_return_t drizzle_state_handshake_server_read(drizzle_st *con)
83
83
{
84
 
  uint8_t *ptr;
 
84
  unsigned char *ptr;
85
85
  int extra_length;
86
86
  unsigned char* packet_end;
87
87
 
128
128
  }
129
129
 
130
130
  /* Look for null-terminated server version string. */
131
 
  ptr= (uint8_t*)memchr(con->buffer_ptr, 0, con->buffer_size - 1);
 
131
  ptr= (unsigned char*)memchr(con->buffer_ptr, 0, con->buffer_size - 1);
132
132
  if (ptr == NULL)
133
133
  {
134
134
    drizzle_set_error(con, "drizzle_state_handshake_server_read",
218
218
 
219
219
drizzle_return_t drizzle_state_handshake_server_write(drizzle_st *con)
220
220
{
221
 
  uint8_t *ptr;
 
221
  unsigned char *ptr;
222
222
 
223
223
  if (con == NULL)
224
224
  {
371
371
  con->buffer_ptr+= 23;
372
372
 
373
373
  /* Look for null-terminated user string. */
374
 
  uint8_t *ptr= (uint8_t*)memchr(con->buffer_ptr, 0, con->buffer_size - 32);
 
374
  unsigned char *ptr= (unsigned char*)memchr(con->buffer_ptr, 0, con->buffer_size - 32);
375
375
  if (ptr == NULL)
376
376
  {
377
377
    drizzle_set_error(con, "drizzle_state_handshake_client_read",
430
430
  }
431
431
  else
432
432
  {
433
 
    ptr= (uint8_t*)memchr(con->buffer_ptr, 0, con->buffer_size -
 
433
    ptr= (unsigned char*)memchr(con->buffer_ptr, 0, con->buffer_size -
434
434
                                    (34 + strlen(con->user) + scramble_size));
435
435
    if (ptr == NULL)
436
436
    {
513
513
 
514
514
drizzle_return_t drizzle_state_handshake_client_write(drizzle_st *con)
515
515
{
516
 
  uint8_t *ptr;
 
516
  unsigned char *ptr;
517
517
  int capabilities;
518
518
#ifdef USE_OPENSSL
519
519
  int ssl_ret;
600
600
 
601
601
drizzle_return_t drizzle_state_handshake_ssl_client_write(drizzle_st *con)
602
602
{
603
 
  uint8_t *ptr;
 
603
  unsigned char *ptr;
604
604
  int capabilities;
605
605
 
606
606
  drizzle_log_debug(con, "drizzle_state_handshake_ssl_client_write");