← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to examples/server.cc

  • Committer: Brian Aker
  • Date: 2011-11-24 03:44:17 UTC
  • mto: This revision was merged to the branch mainline in revision 2465.
  • Revision ID: brian@tangent.org-20111124034417-aafezwidyzjhg6a3
Redo the way options are handled.

Show diffs side-by-side

added added

removed removed

Lines of Context:
examples/server.cc
41
41
#include <stdlib.h>
42
42
#include <unistd.h>
43
43
 
44
 
#include <libdrizzle-1.0/drizzle_server.h>
 
44
#include <libdrizzle-2.0/drizzle_server.h>
45
45
 
46
46
#define DRIZZLE_FIELD_MAX 32
47
47
#define DRIZZLE_RESULT_ROWS 20
70
70
  in_port_t port= 0;
71
71
  drizzle_verbose_t verbose= DRIZZLE_VERBOSE_NEVER;
72
72
  drizzle_return_t ret;
73
 
  drizzle_st drizzle;
 
73
  drizzle_st *drizzle;
74
74
  drizzle_con_st *con_listen= (drizzle_con_st*)malloc(sizeof(drizzle_con_st));
75
75
  drizzle_con_st *con= (drizzle_con_st*)malloc(sizeof(drizzle_con_st));
76
76
  drizzle_result_st result;
132
132
    }
133
133
  }
134
134
 
135
 
  if (drizzle_create(&drizzle) == NULL)
 
135
  if ((drizzle= drizzle_create()) == NULL)
136
136
  {
137
 
    printf("drizzle_create:NULL\n");
 
137
    fprintf(stderr, "drizzle_create:NULL\n");
138
138
    return 1;
139
139
  }
140
140
 
141
 
  drizzle_add_options(&drizzle, DRIZZLE_FREE_OBJECTS);
142
 
  drizzle_set_verbose(&drizzle, verbose);
 
141
  drizzle_set_option(drizzle, DRIZZLE_FREE_OBJECTS, true);
 
142
  drizzle_set_verbose(drizzle, verbose);
143
143
 
144
 
  if (drizzle_con_create(&drizzle, con_listen) == NULL)
 
144
  if (drizzle_con_create(drizzle, con_listen) == NULL)
145
145
  {
146
 
    printf("drizzle_con_create:NULL\n");
 
146
    fprintf(stderr, "drizzle_con_create:NULL\n");
147
147
    return 1;
148
148
  }
149
149
 
151
151
  drizzle_con_set_tcp(con_listen, host, port);
152
152
 
153
153
  if (mysql)
 
154
  {
154
155
    drizzle_con_add_options(con_listen, DRIZZLE_CON_MYSQL);
 
156
  }
155
157
 
156
158
  if (drizzle_con_listen(con_listen) != DRIZZLE_RETURN_OK)
157
159
  {
158
 
    printf("drizzle_con_listen:%s\n", drizzle_error(&drizzle));
 
160
    fprintf(stderr, "drizzle_con_listen:%s\n", drizzle_error(drizzle));
159
161
    return 1;
160
162
  }
161
163
 
162
164
  while (1)
163
165
  {
164
 
    (void)drizzle_con_accept(&drizzle, con, &ret);
 
166
    (void)drizzle_con_accept(drizzle, con, &ret);
165
167
    if (ret != DRIZZLE_RETURN_OK)
166
168
    {
167
 
      printf("drizzle_con_accept:%s\n", drizzle_error(&drizzle));
 
169
      fprintf(stderr, "drizzle_con_accept:%s\n", drizzle_error(drizzle));
168
170
      return 1;
169
171
    }
170
172
 
171
 
    server(&drizzle, con, &result, &column);
 
173
    server(drizzle, con, &result, &column);
172
174
 
173
175
    drizzle_con_free(con);
174
176
 
182
184
  }
183
185
 
184
186
  drizzle_con_free(con_listen);
185
 
  drizzle_free(&drizzle);
 
187
  drizzle_free(drizzle);
186
188
 
187
189
  free(con);
188
190
  free(con_listen);