← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle/drizzle.cc

  • Committer: Brian Aker
  • Date: 2011-12-27 20:30:10 UTC
  • mfrom: (2472.1.9 drizzle-build)
  • mto: This revision was merged to the branch mainline in revision 2482.
  • Revision ID: brian@tangent.org-20111227203010-1ymj1ekc2k37bu8s
Merge yacc tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle/drizzle.cc
391
391
    {
392
392
      if (drizzle != NULL)
393
393
      {
394
 
        drizzle_set_error(drizzle, "drizzle_con_create", "malloc");
 
394
        drizzle_set_error(drizzle, __func__, "Failed to allocate.");
395
395
      }
396
396
 
397
397
      return NULL;
566
566
    pfds= (struct pollfd *)realloc(drizzle->pfds, drizzle->con_count * sizeof(struct pollfd));
567
567
    if (pfds == NULL)
568
568
    {
569
 
      drizzle_set_error(drizzle, "drizzle_con_wait", "realloc");
 
569
      drizzle_set_error(drizzle, __func__, "Failed to realloc file descriptors.");
570
570
      return DRIZZLE_RETURN_MEMORY;
571
571
    }
572
572