← 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-27 01:25:57 UTC
  • mto: This revision was merged to the branch mainline in revision 2465.
  • Revision ID: brian@tangent.org-20111127012557-vxph9h1v32v3m1bz
Move result over to being behind API.

Show diffs side-by-side

added added

removed removed

Lines of Context:
examples/server.cc
58
58
  return; \
59
59
}
60
60
 
61
 
static void server(drizzle_st *drizzle, drizzle_con_st *con,
62
 
                   drizzle_result_st *result, drizzle_column_st *column);
 
61
static void server(drizzle_st *drizzle, drizzle_con_st *con, drizzle_column_st *column);
63
62
 
64
63
int main(int argc, char *argv[])
65
64
{
71
70
  drizzle_verbose_t verbose= DRIZZLE_VERBOSE_NEVER;
72
71
  drizzle_return_t ret;
73
72
  drizzle_st *drizzle;
74
 
  drizzle_result_st result;
75
73
  drizzle_column_st column;
76
74
 
77
75
  while((c = getopt(argc, argv, "c:h:mp:v")) != -1)
169
167
      return 1;
170
168
    }
171
169
 
172
 
    server(drizzle, con, &result, &column);
 
170
    server(drizzle, con, &column);
173
171
 
174
172
    drizzle_con_free(con);
175
173
 
189
187
}
190
188
 
191
189
static void server(drizzle_st *drizzle, drizzle_con_st *con,
192
 
                   drizzle_result_st *result, drizzle_column_st *column)
 
190
                   drizzle_column_st *column)
193
191
{
194
192
  drizzle_return_t ret;
195
193
  drizzle_command_t command;
218
216
  DRIZZLE_RETURN_CHECK(ret, "drizzle_handshake_server_write", drizzle)
219
217
 
220
218
  ret= drizzle_handshake_client_read(con);
221
 
  DRIZZLE_RETURN_CHECK(ret, "drizzle_handshake_client_read", drizzle)
 
219
  DRIZZLE_RETURN_CHECK(ret, "drizzle_handshake_client_read", drizzle);
222
220
 
223
 
  if (drizzle_result_create(con, result) == NULL)
 
221
  drizzle_result_st *result;
 
222
  if ((result= drizzle_result_create(con)) == NULL)
 
223
  {
224
224
    DRIZZLE_RETURN_ERROR("drizzle_result_create", drizzle)
 
225
  }
225
226
 
226
227
  ret= drizzle_result_write(con, result, true);
227
228
  DRIZZLE_RETURN_CHECK(ret, "drizzle_result_write", drizzle)
241
242
    }
242
243
    DRIZZLE_RETURN_CHECK(ret, "drizzle_con_command_buffer", drizzle)
243
244
 
244
 
    if (drizzle_result_create(con, result) == NULL)
 
245
    if ((result= drizzle_result_create(con)) == NULL)
 
246
    {
245
247
      DRIZZLE_RETURN_ERROR("drizzle_result_create", drizzle)
 
248
    }
246
249
 
247
250
    if (command != DRIZZLE_COMMAND_QUERY)
248
251
    {
258
261
 
259
262
    /* Columns. */
260
263
    if (drizzle_column_create(result, column) == NULL)
 
264
    {
261
265
      DRIZZLE_RETURN_ERROR("drizzle_column_create", drizzle)
 
266
    }
262
267
 
263
268
    drizzle_column_set_catalog(column, "default");
264
269
    drizzle_column_set_db(column, "drizzle_test_db");