← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle/client.c

Replacing all bzero() calls with memset() calls and removing the bzero.c file.
Also removing check for bzero from the 'configure.ac' autoconf file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle/client.c
792
792
    free_rows(data);        /* Free old data */
793
793
    return(0);
794
794
  }
795
 
  bzero((char*) field, (uint) sizeof(DRIZZLE_FIELD)*fields);
 
795
  memset((char*) field, 0, (uint) sizeof(DRIZZLE_FIELD)*fields);
796
796
  if (server_capabilities & CLIENT_PROTOCOL_41)
797
797
  {
798
798
    /* server is 4.1, and returns the new field result format */
1411
1411
      unix_socket= drizzle_unix_port;
1412
1412
    host_info= (char*) ER(CR_LOCALHOST_CONNECTION);
1413
1413
 
1414
 
    bzero((char*) &UNIXaddr, sizeof(UNIXaddr));
 
1414
    memset((char*) &UNIXaddr, 0, sizeof(UNIXaddr));
1415
1415
    UNIXaddr.sun_family= AF_UNIX;
1416
1416
    strmake(UNIXaddr.sun_path, unix_socket, sizeof(UNIXaddr.sun_path)-1);
1417
1417
 
1644
1644
    int4store(buff,client_flag);
1645
1645
    int4store(buff+4, net->max_packet_size);
1646
1646
    buff[8]= (char) drizzle->charset->number;
1647
 
    bzero(buff+9, 32-9);
 
1647
    memset(buff+9, 0, 32-9);
1648
1648
    end= buff+32;
1649
1649
  }
1650
1650
  else
1791
1791
  }
1792
1792
  if (drizzle_set_character_set(&tmp_drizzle, drizzle->charset->csname))
1793
1793
  {
1794
 
    bzero((char*) &tmp_drizzle.options,sizeof(tmp_drizzle.options));
 
1794
    memset((char*) &tmp_drizzle.options, 0, sizeof(tmp_drizzle.options));
1795
1795
    drizzle_close(&tmp_drizzle);
1796
1796
    drizzle->net.last_errno= tmp_drizzle.net.last_errno;
1797
1797
    strmov(drizzle->net.last_error, tmp_drizzle.net.last_error);
1803
1803
  tmp_drizzle.free_me= drizzle->free_me;
1804
1804
 
1805
1805
  /* Don't free options as these are now used in tmp_drizzle */
1806
 
  bzero((char*) &drizzle->options,sizeof(drizzle->options));
 
1806
  memset((char*) &drizzle->options, 0, sizeof(drizzle->options));
1807
1807
  drizzle->free_me=0;
1808
1808
  drizzle_close(drizzle);
1809
1809
  *drizzle=tmp_drizzle;
1862
1862
  if (drizzle->options.shared_memory_base_name != def_shared_memory_base_name)
1863
1863
    my_free(drizzle->options.shared_memory_base_name,MYF(MY_ALLOW_ZERO_PTR));
1864
1864
#endif /* HAVE_SMEM */
1865
 
  bzero((char*) &drizzle->options,sizeof(drizzle->options));
 
1865
  memset((char*) &drizzle->options, 0, sizeof(drizzle->options));
1866
1866
  return;
1867
1867
}
1868
1868
 
2029
2029
  result->fields=  drizzle->fields;
2030
2030
  result->field_alloc=  drizzle->field_alloc;
2031
2031
  result->field_count=  drizzle->field_count;
2032
 
  /* The rest of result members is bzeroed in malloc */
 
2032
  /* The rest of result members is zeroed in malloc */
2033
2033
  drizzle->fields=0;        /* fields is now in result */
2034
2034
  clear_alloc_root(&drizzle->field_alloc);
2035
2035
  /* just in case this was mistakenly called after drizzle_stmt_execute() */