Mercurial > urweb
comparison src/c/cgi.c @ 1979:81bc76aa4acd
Merge in upstream changes.
author | Patrick Hurst <phurst@mit.edu> |
---|---|
date | Sat, 18 Jan 2014 18:26:24 -0500 |
parents | 9f3597979e98 |
children | c93fbd139732 |
comparison
equal
deleted
inserted
replaced
1978:c5143edaf3c7 | 1979:81bc76aa4acd |
---|---|
132 | 132 |
133 void uw_copy_client_data(void *dst, void *src) { | 133 void uw_copy_client_data(void *dst, void *src) { |
134 } | 134 } |
135 | 135 |
136 void uw_do_expunge(uw_context ctx, uw_Basis_client cli, void *data) { | 136 void uw_do_expunge(uw_context ctx, uw_Basis_client cli, void *data) { |
137 if (uw_get_app(ctx)->db_begin(ctx)) | 137 uw_ensure_transaction(ctx); |
138 uw_error(ctx, FATAL, "Error running SQL BEGIN"); | |
139 uw_get_app(ctx)->expunger(ctx, cli); | 138 uw_get_app(ctx)->expunger(ctx, cli); |
140 uw_commit(ctx); | 139 |
140 if (uw_commit(ctx)) | |
141 uw_error(ctx, UNLIMITED_RETRY, "Rerunning expunge transaction"); | |
141 } | 142 } |
142 | 143 |
143 void uw_post_expunge(uw_context ctx, void *data) { | 144 void uw_post_expunge(uw_context ctx, void *data) { |
144 } | 145 } |
145 | 146 |