Skip to content

Commit 596ec9d

Browse files
nrwahl2nrwahl2
committed
Refactor: libcib: Drop options arg from cib__op_fn_t
The request argument provides the options value for functions that need it. Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
1 parent 96c0026 commit 596ec9d

6 files changed

Lines changed: 110 additions & 92 deletions

File tree

‎daemons/based/based_messages.c‎

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ xmlNode *the_cib = NULL;
3737
* \internal
3838
* \brief Process a \c PCMK__CIB_REQUEST_ABS_DELETE
3939
*
40-
* \param[in] options Ignored
4140
* \param[in] section Ignored
4241
* \param[in] req Ignored
4342
* \param[in] input Ignored
@@ -49,8 +48,8 @@ xmlNode *the_cib = NULL;
4948
* \note This is unimplemented and simply returns an error.
5049
*/
5150
int
52-
based_process_abs_delete(int options, const char *section, xmlNode *req,
53-
xmlNode *input, xmlNode **cib, xmlNode **answer)
51+
based_process_abs_delete(const char *section, xmlNode *req, xmlNode *input,
52+
xmlNode **cib, xmlNode **answer)
5453
{
5554
/* @COMPAT Remove when PCMK__CIB_REQUEST_ABS_DELETE is removed. Note that
5655
* external clients with Pacemaker versions < 3.0.0 can send it.
@@ -59,8 +58,8 @@ based_process_abs_delete(int options, const char *section, xmlNode *req,
5958
}
6059

6160
int
62-
based_process_commit_transact(int options, const char *section, xmlNode *req,
63-
xmlNode *input, xmlNode **cib, xmlNode **answer)
61+
based_process_commit_transact(const char *section, xmlNode *req, xmlNode *input,
62+
xmlNode **cib, xmlNode **answer)
6463
{
6564
/* On success, our caller will activate *cib locally, trigger a replace
6665
* notification if appropriate, and sync *cib to all nodes. On failure, our
@@ -84,25 +83,25 @@ based_process_commit_transact(int options, const char *section, xmlNode *req,
8483
}
8584

8685
int
87-
based_process_is_primary(int options, const char *section, xmlNode *req,
88-
xmlNode *input, xmlNode **cib, xmlNode **answer)
86+
based_process_is_primary(const char *section, xmlNode *req, xmlNode *input,
87+
xmlNode **cib, xmlNode **answer)
8988
{
9089
// @COMPAT Pacemaker Remote clients <3.0.0 may send this
9190
return (based_is_primary? pcmk_rc_ok : EPERM);
9291
}
9392

9493
// @COMPAT: Remove when PCMK__CIB_REQUEST_NOOP is removed
9594
int
96-
based_process_noop(int options, const char *section, xmlNode *req,
97-
xmlNode *input, xmlNode **cib, xmlNode **answer)
95+
based_process_noop(const char *section, xmlNode *req, xmlNode *input,
96+
xmlNode **cib, xmlNode **answer)
9897
{
9998
*answer = NULL;
10099
return pcmk_rc_ok;
101100
}
102101

103102
int
104-
based_process_ping(int options, const char *section, xmlNode *req,
105-
xmlNode *input, xmlNode **cib, xmlNode **answer)
103+
based_process_ping(const char *section, xmlNode *req, xmlNode *input,
104+
xmlNode **cib, xmlNode **answer)
106105
{
107106
/* existing_cib and *cib should be identical. In the absence of ACL
108107
* filtering, they should also match the_cib. However, they may be copies
@@ -145,8 +144,8 @@ based_process_ping(int options, const char *section, xmlNode *req,
145144
}
146145

147146
int
148-
based_process_primary(int options, const char *section, xmlNode *req,
149-
xmlNode *input, xmlNode **cib, xmlNode **answer)
147+
based_process_primary(const char *section, xmlNode *req, xmlNode *input,
148+
xmlNode **cib, xmlNode **answer)
150149
{
151150
if (!based_is_primary) {
152151
pcmk__info("We are now in R/W mode");
@@ -160,8 +159,8 @@ based_process_primary(int options, const char *section, xmlNode *req,
160159
}
161160

162161
int
163-
based_process_schemas(int options, const char *section, xmlNode *req,
164-
xmlNode *input, xmlNode **cib, xmlNode **answer)
162+
based_process_schemas(const char *section, xmlNode *req, xmlNode *input,
163+
xmlNode **cib, xmlNode **answer)
165164
{
166165
xmlNode *wrapper = NULL;
167166
xmlNode *data = NULL;
@@ -205,8 +204,8 @@ based_process_schemas(int options, const char *section, xmlNode *req,
205204
}
206205

207206
int
208-
based_process_secondary(int options, const char *section, xmlNode *req,
209-
xmlNode *input, xmlNode **cib, xmlNode **answer)
207+
based_process_secondary(const char *section, xmlNode *req, xmlNode *input,
208+
xmlNode **cib, xmlNode **answer)
210209
{
211210
if (based_is_primary) {
212211
pcmk__info("We are now in R/O mode");
@@ -220,8 +219,8 @@ based_process_secondary(int options, const char *section, xmlNode *req,
220219
}
221220

222221
int
223-
based_process_shutdown(int options, const char *section, xmlNode *req,
224-
xmlNode *input, xmlNode **cib, xmlNode **answer)
222+
based_process_shutdown(const char *section, xmlNode *req, xmlNode *input,
223+
xmlNode **cib, xmlNode **answer)
225224
{
226225
const char *host = pcmk__xe_get(req, PCMK__XA_SRC);
227226

@@ -243,15 +242,15 @@ based_process_shutdown(int options, const char *section, xmlNode *req,
243242
}
244243

245244
int
246-
based_process_sync(int options, const char *section, xmlNode *req,
247-
xmlNode *input, xmlNode **cib, xmlNode **answer)
245+
based_process_sync(const char *section, xmlNode *req, xmlNode *input,
246+
xmlNode **cib, xmlNode **answer)
248247
{
249248
return sync_our_cib(req, true);
250249
}
251250

252251
int
253-
based_process_upgrade(int options, const char *section, xmlNode *req,
254-
xmlNode *input, xmlNode **cib, xmlNode **answer)
252+
based_process_upgrade(const char *section, xmlNode *req, xmlNode *input,
253+
xmlNode **cib, xmlNode **answer)
255254
{
256255
int rc = pcmk_rc_ok;
257256

@@ -263,7 +262,7 @@ based_process_upgrade(int options, const char *section, xmlNode *req,
263262
* re-broadcasts the request with PCMK__XA_CIB_SCHEMA_MAX, and each node
264263
* performs the upgrade (and notifies its local clients) here.
265264
*/
266-
return cib__process_upgrade(options, section, req, input, cib, answer);
265+
return cib__process_upgrade(section, req, input, cib, answer);
267266

268267
} else {
269268
xmlNode *scratch = pcmk__xml_copy(NULL, *cib);

‎daemons/based/based_messages.h‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,42 +17,42 @@
1717
extern bool based_is_primary;
1818
extern xmlNode *the_cib;
1919

20-
int based_process_abs_delete(int options, const char *section, xmlNode *req,
21-
xmlNode *input, xmlNode **cib, xmlNode **answer);
20+
int based_process_abs_delete(const char *section, xmlNode *req, xmlNode *input,
21+
xmlNode **cib, xmlNode **answer);
2222

23-
int based_process_apply_patch(int options, const char *section, xmlNode *req,
24-
xmlNode *input, xmlNode **cib, xmlNode **answer);
23+
int based_process_apply_patch(const char *section, xmlNode *req, xmlNode *input,
24+
xmlNode **cib, xmlNode **answer);
2525

26-
int based_process_commit_transact(int options, const char *section,
27-
xmlNode *req, xmlNode *input, xmlNode **cib,
26+
int based_process_commit_transact(const char *section, xmlNode *req,
27+
xmlNode *input, xmlNode **cib,
2828
xmlNode **answer);
2929

30-
int based_process_is_primary(int options, const char *section, xmlNode *req,
31-
xmlNode *input, xmlNode **cib, xmlNode **answer);
30+
int based_process_is_primary(const char *section, xmlNode *req, xmlNode *input,
31+
xmlNode **cib, xmlNode **answer);
3232

33-
int based_process_noop(int options, const char *section, xmlNode *req,
34-
xmlNode *input, xmlNode **cib, xmlNode **answer);
33+
int based_process_noop(const char *section, xmlNode *req, xmlNode *input,
34+
xmlNode **cib, xmlNode **answer);
3535

36-
int based_process_ping(int options, const char *section, xmlNode *req,
37-
xmlNode *input, xmlNode **cib, xmlNode **answer);
36+
int based_process_ping(const char *section, xmlNode *req, xmlNode *input,
37+
xmlNode **cib, xmlNode **answer);
3838

39-
int based_process_primary(int options, const char *section, xmlNode *req,
40-
xmlNode *input, xmlNode **cib, xmlNode **answer);
39+
int based_process_primary(const char *section, xmlNode *req, xmlNode *input,
40+
xmlNode **cib, xmlNode **answer);
4141

42-
int based_process_schemas(int options, const char *section, xmlNode *req,
43-
xmlNode *input, xmlNode **cib, xmlNode **answer);
42+
int based_process_schemas(const char *section, xmlNode *req, xmlNode *input,
43+
xmlNode **cib, xmlNode **answer);
4444

45-
int based_process_secondary(int options, const char *section, xmlNode *req,
46-
xmlNode *input, xmlNode **cib, xmlNode **answer);
45+
int based_process_secondary(const char *section, xmlNode *req, xmlNode *input,
46+
xmlNode **cib, xmlNode **answer);
4747

48-
int based_process_shutdown(int options, const char *section, xmlNode *req,
49-
xmlNode *input, xmlNode **cib, xmlNode **answer);
48+
int based_process_shutdown(const char *section, xmlNode *req, xmlNode *input,
49+
xmlNode **cib, xmlNode **answer);
5050

51-
int based_process_sync(int options, const char *section, xmlNode *req,
52-
xmlNode *input, xmlNode **cib, xmlNode **answer);
51+
int based_process_sync(const char *section, xmlNode *req, xmlNode *input,
52+
xmlNode **cib, xmlNode **answer);
5353

54-
int based_process_upgrade(int options, const char *section, xmlNode *req,
55-
xmlNode *input, xmlNode **cib, xmlNode **answer);
54+
int based_process_upgrade(const char *section, xmlNode *req, xmlNode *input,
55+
xmlNode **cib, xmlNode **answer);
5656

5757
int sync_our_cib(xmlNode *request, bool all);
5858

‎include/crm/cib/internal.h‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ enum cib__op_type {
103103
* replace *cib, but the replacement must become the root of the original
104104
* document.
105105
*/
106-
typedef int (*cib__op_fn_t)(int options, const char *section, xmlNode *request,
106+
typedef int (*cib__op_fn_t)(const char *section, xmlNode *request,
107107
xmlNode *input, xmlNode **cib, xmlNode **output);
108108

109109
typedef struct {
@@ -207,32 +207,32 @@ void cib_native_notify(gpointer data, gpointer user_data);
207207

208208
int cib__get_operation(const char *op, const cib__operation_t **operation);
209209

210-
int cib__process_apply_patch(int options, const char *section, xmlNode *req,
211-
xmlNode *input, xmlNode **cib, xmlNode **answer);
210+
int cib__process_apply_patch(const char *section, xmlNode *req, xmlNode *input,
211+
xmlNode **cib, xmlNode **answer);
212212

213-
int cib__process_bump(int options, const char *section, xmlNode *req,
214-
xmlNode *input, xmlNode **cib, xmlNode **answer);
213+
int cib__process_bump(const char *section, xmlNode *req, xmlNode *input,
214+
xmlNode **cib, xmlNode **answer);
215215

216-
int cib__process_create(int options, const char *section, xmlNode *req,
217-
xmlNode *input, xmlNode **cib, xmlNode **answer);
216+
int cib__process_create(const char *section, xmlNode *req, xmlNode *input,
217+
xmlNode **cib, xmlNode **answer);
218218

219-
int cib__process_delete(int options, const char *section, xmlNode *req,
220-
xmlNode *input, xmlNode **cib, xmlNode **answer);
219+
int cib__process_delete(const char *section, xmlNode *req, xmlNode *input,
220+
xmlNode **cib, xmlNode **answer);
221221

222-
int cib__process_erase(int options, const char *section, xmlNode *req,
223-
xmlNode *input, xmlNode **cib, xmlNode **answer);
222+
int cib__process_erase(const char *section, xmlNode *req, xmlNode *input,
223+
xmlNode **cib, xmlNode **answer);
224224

225-
int cib__process_modify(int options, const char *section, xmlNode *req,
226-
xmlNode *input, xmlNode **cib, xmlNode **answer);
225+
int cib__process_modify(const char *section, xmlNode *req, xmlNode *input,
226+
xmlNode **cib, xmlNode **answer);
227227

228-
int cib__process_query(int options, const char *section, xmlNode *req,
229-
xmlNode *input, xmlNode **cib, xmlNode **answer);
228+
int cib__process_query(const char *section, xmlNode *req, xmlNode *input,
229+
xmlNode **cib, xmlNode **answer);
230230

231-
int cib__process_replace(int options, const char *section, xmlNode *req,
232-
xmlNode *input, xmlNode **cib, xmlNode **answer);
231+
int cib__process_replace(const char *section, xmlNode *req, xmlNode *input,
232+
xmlNode **cib, xmlNode **answer);
233233

234-
int cib__process_upgrade(int options, const char *section, xmlNode *req,
235-
xmlNode *input, xmlNode **cib, xmlNode **answer);
234+
int cib__process_upgrade(const char *section, xmlNode *req, xmlNode *input,
235+
xmlNode **cib, xmlNode **answer);
236236

237237
int cib_internal_op(cib_t * cib, const char *op, const char *host,
238238
const char *section, xmlNode * data,

‎lib/cib/cib_file.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,8 +302,8 @@ commit_transaction(cib_t *cib, xmlNode *transaction, xmlNode **result_cib)
302302
}
303303

304304
static int
305-
process_commit_transact(int options, const char *section, xmlNode *req,
306-
xmlNode *input, xmlNode **cib_xml, xmlNode **answer)
305+
process_commit_transact(const char *section, xmlNode *req, xmlNode *input,
306+
xmlNode **cib_xml, xmlNode **answer)
307307
{
308308
int rc = pcmk_rc_ok;
309309
const char *client_id = pcmk__xe_get(req, PCMK__XA_CIB_CLIENTID);

0 commit comments

Comments
 (0)