Contents of /trunk/rapidsvn/patches/rapidsvn-0.12.0-svn17.patch
Parent Directory | Revision Log
Revision 1579 -
(show annotations)
(download)
Fri Nov 25 15:32:54 2011 UTC (12 years, 10 months ago) by niro
File size: 2442 byte(s)
Fri Nov 25 15:32:54 2011 UTC (12 years, 10 months ago) by niro
File size: 2442 byte(s)
-added rpaid svn to tree
1 | --- rapidsvn-0.12.0-1/src/svncpp/context.cpp 2009-10-20 08:49:09.000000000 +0200 |
2 | +++ rapidsvn-0.12.0-1-magellan/src/svncpp/context.cpp 2011-11-25 16:55:39.297982754 +0100 |
3 | @@ -65,7 +65,7 @@ |
4 | bool logIsSet; |
5 | int promptCounter; |
6 | Pool pool; |
7 | - svn_client_ctx_t ctx; |
8 | + svn_client_ctx_t * ctx; |
9 | std::string username; |
10 | std::string password; |
11 | std::string logMessage; |
12 | @@ -205,26 +205,26 @@ |
13 | svn_auth_open(&ab, providers, pool); |
14 | |
15 | // initialize ctx structure |
16 | - memset(&ctx, 0, sizeof(ctx)); |
17 | + svn_client_create_context(&ctx, pool); |
18 | |
19 | // get the config based on the configDir passed in |
20 | - svn_config_get_config(&ctx.config, c_configDir, pool); |
21 | + svn_config_get_config(&ctx->config, c_configDir, pool); |
22 | |
23 | // tell the auth functions where the config is |
24 | svn_auth_set_parameter(ab, SVN_AUTH_PARAM_CONFIG_DIR, |
25 | c_configDir); |
26 | |
27 | - ctx.auth_baton = ab; |
28 | - ctx.log_msg_func = onLogMsg; |
29 | - ctx.log_msg_baton = this; |
30 | - ctx.notify_func = onNotify; |
31 | - ctx.notify_baton = this; |
32 | - ctx.cancel_func = onCancel; |
33 | - ctx.cancel_baton = this; |
34 | + ctx->auth_baton = ab; |
35 | + ctx->log_msg_func = onLogMsg; |
36 | + ctx->log_msg_baton = this; |
37 | + ctx->notify_func = onNotify; |
38 | + ctx->notify_baton = this; |
39 | + ctx->cancel_func = onCancel; |
40 | + ctx->cancel_baton = this; |
41 | |
42 | #if (SVN_VER_MAJOR >= 1) && (SVN_VER_MINOR >= 2) |
43 | - ctx.notify_func2 = onNotify2; |
44 | - ctx.notify_baton2 = this; |
45 | + ctx->notify_func2 = onNotify2; |
46 | + ctx->notify_baton2 = this; |
47 | #endif |
48 | } |
49 | |
50 | @@ -234,7 +234,7 @@ |
51 | if (!value) |
52 | param = (void *)"1"; |
53 | |
54 | - svn_auth_set_parameter(ctx.auth_baton, |
55 | + svn_auth_set_parameter(ctx->auth_baton, |
56 | SVN_AUTH_PARAM_NO_AUTH_CACHE, |
57 | param); |
58 | } |
59 | @@ -245,7 +245,7 @@ |
60 | username = usr; |
61 | password = pwd; |
62 | |
63 | - svn_auth_baton_t * ab = ctx.auth_baton; |
64 | + svn_auth_baton_t * ab = ctx->auth_baton; |
65 | svn_auth_set_parameter(ab, SVN_AUTH_PARAM_DEFAULT_USERNAME, |
66 | username.c_str()); |
67 | svn_auth_set_parameter(ab, SVN_AUTH_PARAM_DEFAULT_PASSWORD, |
68 | @@ -654,13 +654,13 @@ |
69 | |
70 | Context::operator svn_client_ctx_t * () |
71 | { |
72 | - return &(m->ctx); |
73 | + return m->ctx; |
74 | } |
75 | |
76 | svn_client_ctx_t * |
77 | Context::ctx() |
78 | { |
79 | - return &(m->ctx); |
80 | + return m->ctx; |
81 | } |
82 | |
83 | void |