← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle/drizzle.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/drizzle.cc
40
40
 * @brief Drizzle Definitions
41
41
 */
42
42
 
43
 
#include <libdrizzle-1.0/common.h>
 
43
#include <libdrizzle/common.h>
44
44
 
45
45
/**
46
46
 * @addtogroup drizzle_static Static Drizzle Declarations
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