comparison include/urweb/urweb_cpp.h @ 2206:c1a62ce47083

Merge.
author Ziv Scully <ziv@mit.edu>
date Tue, 27 May 2014 21:38:01 -0400
parents 01c8aceac480 93ff76058825
children ef766ef6e242
comparison
equal deleted inserted replaced
2205:cdea39473c78 2206:c1a62ce47083
12 12
13 void uw_global_init(void); 13 void uw_global_init(void);
14 void uw_app_init(uw_app*); 14 void uw_app_init(uw_app*);
15 15
16 void uw_client_connect(unsigned id, int pass, int sock, 16 void uw_client_connect(unsigned id, int pass, int sock,
17 int (*send)(int sockfd, const void *buf, size_t len), 17 int (*send)(int sockfd, const void *buf, ssize_t len),
18 int (*close)(int fd), 18 int (*close)(int fd),
19 void *logger_data, uw_logger log_error); 19 void *logger_data, uw_logger log_error);
20 void uw_prune_clients(struct uw_context *); 20 void uw_prune_clients(struct uw_context *);
21 failure_kind uw_initialize(struct uw_context *); 21 failure_kind uw_initialize(struct uw_context *);
22 22
23 struct uw_context * uw_init(int id, void *logger_data, uw_logger log_debug); 23 struct uw_context * uw_init(int id, uw_loggers *lg);
24 void uw_close(struct uw_context *); 24 void uw_close(struct uw_context *);
25 int uw_set_app(struct uw_context *, uw_app*); 25 int uw_set_app(struct uw_context *, uw_app*);
26 uw_app *uw_get_app(struct uw_context *); 26 uw_app *uw_get_app(struct uw_context *);
27 void uw_set_db(struct uw_context *, void*); 27 void uw_set_db(struct uw_context *, void*);
28 void *uw_get_db(struct uw_context *); 28 void *uw_get_db(struct uw_context *);
34 34
35 failure_kind uw_begin_init(struct uw_context *); 35 failure_kind uw_begin_init(struct uw_context *);
36 void uw_set_on_success(char *); 36 void uw_set_on_success(char *);
37 void uw_set_headers(struct uw_context *, char *(*get_header)(void *, const char *), void *get_header_data); 37 void uw_set_headers(struct uw_context *, char *(*get_header)(void *, const char *), void *get_header_data);
38 void uw_set_env(struct uw_context *, char *(*get_env)(void *, const char *), void *get_env_data); 38 void uw_set_env(struct uw_context *, char *(*get_env)(void *, const char *), void *get_env_data);
39 uw_loggers* uw_get_loggers(struct uw_context *ctx);
40 uw_loggers* uw_get_loggers(struct uw_context *ctx);
39 failure_kind uw_begin(struct uw_context *, char *path); 41 failure_kind uw_begin(struct uw_context *, char *path);
40 void uw_ensure_transaction(struct uw_context *); 42 void uw_ensure_transaction(struct uw_context *);
41 failure_kind uw_begin_onError(struct uw_context *, char *msg); 43 failure_kind uw_begin_onError(struct uw_context *, char *msg);
42 void uw_login(struct uw_context *); 44 void uw_login(struct uw_context *);
43 int uw_commit(struct uw_context *); 45 int uw_commit(struct uw_context *);
280 uw_Basis_int uw_Basis_datetimeMinute(struct uw_context *, uw_Basis_time); 282 uw_Basis_int uw_Basis_datetimeMinute(struct uw_context *, uw_Basis_time);
281 uw_Basis_int uw_Basis_datetimeSecond(struct uw_context *, uw_Basis_time); 283 uw_Basis_int uw_Basis_datetimeSecond(struct uw_context *, uw_Basis_time);
282 uw_Basis_int uw_Basis_datetimeDayOfWeek(struct uw_context *, uw_Basis_time); 284 uw_Basis_int uw_Basis_datetimeDayOfWeek(struct uw_context *, uw_Basis_time);
283 extern const uw_Basis_time uw_Basis_minTime; 285 extern const uw_Basis_time uw_Basis_minTime;
284 286
285 void uw_register_transactional(struct uw_context *, void *data, uw_callback commit, uw_callback rollback, uw_callback_with_retry free); 287 int uw_register_transactional(struct uw_context *, void *data, uw_callback commit, uw_callback rollback, uw_callback_with_retry free);
286 288
287 void uw_check_heap(struct uw_context *, size_t extra); 289 void uw_check_heap(struct uw_context *, size_t extra);
288 char *uw_heap_front(struct uw_context *); 290 char *uw_heap_front(struct uw_context *);
289 void uw_set_heap_front(struct uw_context *, char*); 291 void uw_set_heap_front(struct uw_context *, char*);
290 292
387 uw_Basis_string uw_Basis_fieldName(struct uw_context *, uw_Basis_postField); 389 uw_Basis_string uw_Basis_fieldName(struct uw_context *, uw_Basis_postField);
388 uw_Basis_string uw_Basis_fieldValue(struct uw_context *, uw_Basis_postField); 390 uw_Basis_string uw_Basis_fieldValue(struct uw_context *, uw_Basis_postField);
389 uw_Basis_string uw_Basis_remainingFields(struct uw_context *, uw_Basis_postField); 391 uw_Basis_string uw_Basis_remainingFields(struct uw_context *, uw_Basis_postField);
390 uw_Basis_postField *uw_Basis_firstFormField(struct uw_context *, uw_Basis_string); 392 uw_Basis_postField *uw_Basis_firstFormField(struct uw_context *, uw_Basis_string);
391 393
394 uw_Basis_string uw_Basis_blessData(struct uw_context *, uw_Basis_string);
395
392 extern const char uw_begin_xhtml[], uw_begin_html5[]; 396 extern const char uw_begin_xhtml[], uw_begin_html5[];
393 397
394 #endif 398 #endif