← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to examples/proxy.cc

  • Committer: Brian Aker
  • Date: 2011-11-26 23:14:59 UTC
  • mto: This revision was merged to the branch mainline in revision 2465.
  • Revision ID: brian@tangent.org-20111126231459-pa9i3arizevf0vlr
Remove con from being passed object.

Show diffs side-by-side

added added

removed removed

Lines of Context:
examples/proxy.cc
71
71
  drizzle_verbose_t verbose= DRIZZLE_VERBOSE_NEVER;
72
72
  drizzle_return_t ret;
73
73
  drizzle_st *drizzle;
74
 
  drizzle_con_st *con_listen= (drizzle_con_st*)malloc(sizeof(drizzle_con_st));
75
 
  drizzle_con_st *server= (drizzle_con_st*)malloc(sizeof(drizzle_con_st));
76
 
  drizzle_con_st *client= (drizzle_con_st*)malloc(sizeof(drizzle_con_st));
77
74
  drizzle_result_st server_result;
78
75
  drizzle_result_st client_result;
79
76
  drizzle_column_st column;
158
155
  drizzle_set_option(drizzle, DRIZZLE_FREE_OBJECTS, true);
159
156
  drizzle_set_verbose(drizzle, verbose);
160
157
 
161
 
  if (drizzle_con_create(drizzle, con_listen) == NULL)
 
158
  drizzle_con_st *con_listen;
 
159
  if ((con_listen= drizzle_con_create(drizzle)) == NULL)
162
160
  {
163
161
    fprintf(stderr, "drizzle_con_create:NULL\n");
164
162
    return 1;
180
178
 
181
179
  while (1)
182
180
  {
183
 
    (void)drizzle_con_accept(drizzle, server, &ret);
 
181
    drizzle_con_st *server= drizzle_con_accept(drizzle, &ret);
184
182
    if (ret != DRIZZLE_RETURN_OK)
185
183
    {
186
184
      fprintf(stderr, "drizzle_con_accept:%s\n", drizzle_error(drizzle));
187
185
      return 1;
188
186
    }
189
187
 
190
 
    if (drizzle_con_create(drizzle, client) == NULL)
 
188
    drizzle_con_st *client;
 
189
    if ((client= drizzle_con_create(drizzle)) == NULL)
191
190
    {
192
191
      fprintf(stderr, "drizzle_con_create:NULL\n");
193
192
      return 1;
196
195
    drizzle_con_add_options(client,
197
196
                            DRIZZLE_CON_RAW_PACKET | DRIZZLE_CON_RAW_SCRAMBLE);
198
197
    if (client_mysql)
 
198
    {
199
199
      drizzle_con_add_options(client, DRIZZLE_CON_MYSQL);
 
200
    }
200
201
    drizzle_con_set_tcp(client, client_host, client_port);
201
202
 
202
203
    ret= drizzle_con_connect(client);
223
224
  drizzle_con_free(con_listen);
224
225
  drizzle_free(drizzle);
225
226
 
226
 
  free(con_listen);
227
 
  free(server);
228
 
  free(client);
229
 
 
230
227
  return 0;
231
228
}
232
229