← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle/handshake.cc

  • Committer: Mark Atwood
  • Date: 2011-12-30 22:59:59 UTC
  • mfrom: (2478.1.3 drizzle-build)
  • Revision ID: me@mark.atwood.name-20111230225959-m3wdvqiymv3a4q2w
merge lp:~brianaker/drizzle/yacc-merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle/handshake.cc
40
40
 * @brief Handshake Definitions
41
41
 */
42
42
 
43
 
#include <libdrizzle-1.0/common.h>
 
43
#include <libdrizzle/common.h>
44
44
 
45
45
/*
46
46
 * Client Definitions
283
283
  ptr+= 4;
284
284
 
285
285
  if (con->scramble == NULL)
 
286
  {
286
287
    memset(ptr, 0, 8);
 
288
  }
287
289
  else
 
290
  {
288
291
    memcpy(ptr, con->scramble, 8);
 
292
  }
289
293
  ptr+= 8;
290
294
 
291
295
  ptr[0]= 0;
308
312
  ptr+= 13;
309
313
 
310
314
  if (con->scramble == NULL)
 
315
  {
311
316
    memset(ptr, 0, 12);
 
317
  }
312
318
  else
 
319
  {
313
320
    memcpy(ptr, con->scramble + 8, 12);
 
321
  }
314
322
  ptr+= 12;
315
323
 
316
324
  ptr[0]= 0;