Skip to content

Commit 18a261e

Browse files
mistotebemistotebe
committed
Drop unused/unusable argument
1 parent 7857291 commit 18a261e

File tree

6 files changed

+36
-38
lines changed

6 files changed

+36
-38
lines changed

‎Modules/LDAPObject.c

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ l_ldap_unbind_ext(LDAPObject *self, PyObject *args)
415415
LDAPControl_List_DEL(client_ldcs);
416416

417417
if (ldaperror != LDAP_SUCCESS)
418-
return LDAPerror(self->ldap, "ldap_unbind_ext");
418+
return LDAPerror(self->ldap);
419419

420420
self->valid = 0;
421421
Py_INCREF(Py_None);
@@ -461,7 +461,7 @@ l_ldap_abandon_ext(LDAPObject *self, PyObject *args)
461461
LDAPControl_List_DEL(client_ldcs);
462462

463463
if (ldaperror != LDAP_SUCCESS)
464-
return LDAPerror(self->ldap, "ldap_abandon_ext");
464+
return LDAPerror(self->ldap);
465465

466466
Py_INCREF(Py_None);
467467
return Py_None;
@@ -517,7 +517,7 @@ l_ldap_add_ext(LDAPObject *self, PyObject *args)
517517
LDAPControl_List_DEL(client_ldcs);
518518

519519
if (ldaperror != LDAP_SUCCESS)
520-
return LDAPerror(self->ldap, "ldap_add_ext");
520+
return LDAPerror(self->ldap);
521521

522522
return PyInt_FromLong(msgid);
523523
}
@@ -568,7 +568,7 @@ l_ldap_simple_bind(LDAPObject *self, PyObject *args)
568568
LDAPControl_List_DEL(client_ldcs);
569569

570570
if (ldaperror != LDAP_SUCCESS)
571-
return LDAPerror(self->ldap, "ldap_simple_bind");
571+
return LDAPerror(self->ldap);
572572

573573
return PyInt_FromLong(msgid);
574574
}
@@ -727,7 +727,7 @@ l_ldap_sasl_bind_s(LDAPObject *self, PyObject *args)
727727
servercred->bv_len);
728728
}
729729
else if (ldaperror != LDAP_SUCCESS)
730-
return LDAPerror(self->ldap, "l_ldap_sasl_bind_s");
730+
return LDAPerror(self->ldap);
731731
return PyInt_FromLong(ldaperror);
732732
}
733733

@@ -806,7 +806,7 @@ l_ldap_sasl_interactive_bind_s(LDAPObject *self, PyObject *args)
806806
LDAPControl_List_DEL(client_ldcs);
807807

808808
if (msgid != LDAP_SUCCESS)
809-
return LDAPerror(self->ldap, "ldap_sasl_interactive_bind_s");
809+
return LDAPerror(self->ldap);
810810
return PyInt_FromLong(msgid);
811811
}
812812
#endif
@@ -854,7 +854,7 @@ l_ldap_cancel(LDAPObject *self, PyObject *args)
854854
LDAPControl_List_DEL(client_ldcs);
855855

856856
if (ldaperror != LDAP_SUCCESS)
857-
return LDAPerror(self->ldap, "ldap_cancel");
857+
return LDAPerror(self->ldap);
858858

859859
return PyInt_FromLong(msgid);
860860
}
@@ -908,7 +908,7 @@ l_ldap_compare_ext(LDAPObject *self, PyObject *args)
908908
LDAPControl_List_DEL(client_ldcs);
909909

910910
if (ldaperror != LDAP_SUCCESS)
911-
return LDAPerror(self->ldap, "ldap_compare_ext");
911+
return LDAPerror(self->ldap);
912912

913913
return PyInt_FromLong(msgid);
914914
}
@@ -954,7 +954,7 @@ l_ldap_delete_ext(LDAPObject *self, PyObject *args)
954954
LDAPControl_List_DEL(client_ldcs);
955955

956956
if (ldaperror != LDAP_SUCCESS)
957-
return LDAPerror(self->ldap, "ldap_delete_ext");
957+
return LDAPerror(self->ldap);
958958

959959
return PyInt_FromLong(msgid);
960960
}
@@ -1011,7 +1011,7 @@ l_ldap_modify_ext(LDAPObject *self, PyObject *args)
10111011
LDAPControl_List_DEL(client_ldcs);
10121012

10131013
if (ldaperror != LDAP_SUCCESS)
1014-
return LDAPerror(self->ldap, "ldap_modify_ext");
1014+
return LDAPerror(self->ldap);
10151015

10161016
return PyInt_FromLong(msgid);
10171017
}
@@ -1061,7 +1061,7 @@ l_ldap_rename(LDAPObject *self, PyObject *args)
10611061
LDAPControl_List_DEL(client_ldcs);
10621062

10631063
if (ldaperror != LDAP_SUCCESS)
1064-
return LDAPerror(self->ldap, "ldap_rename");
1064+
return LDAPerror(self->ldap);
10651065

10661066
return PyInt_FromLong(msgid);
10671067
}
@@ -1108,7 +1108,7 @@ l_ldap_result4(LDAPObject *self, PyObject *args)
11081108
LDAP_END_ALLOW_THREADS(self);
11091109

11101110
if (res_type < 0) /* LDAP or system error */
1111-
return LDAPerror(self->ldap, "ldap_result4");
1111+
return LDAPerror(self->ldap);
11121112

11131113
if (res_type == 0) {
11141114
/* Polls return (None, None, None, None); timeouts raise an exception */
@@ -1164,7 +1164,7 @@ l_ldap_result4(LDAPObject *self, PyObject *args)
11641164
if (result != LDAP_SUCCESS) { /* result error */
11651165
ldap_controls_free(serverctrls);
11661166
Py_XDECREF(valuestr);
1167-
return LDAPraise_for_message(self->ldap, "ldap_parse_result", msg);
1167+
return LDAPraise_for_message(self->ldap, msg);
11681168
}
11691169

11701170
if (!(pyctrls = LDAPControls_to_List(serverctrls))) {
@@ -1176,7 +1176,7 @@ l_ldap_result4(LDAPObject *self, PyObject *args)
11761176
ldap_controls_free(serverctrls);
11771177
ldap_msgfree(msg);
11781178
Py_XDECREF(valuestr);
1179-
return LDAPerror(self->ldap, "LDAPControls_to_List");
1179+
return LDAPerror(self->ldap);
11801180
}
11811181
ldap_controls_free(serverctrls);
11821182

@@ -1277,7 +1277,7 @@ l_ldap_search_ext(LDAPObject *self, PyObject *args)
12771277
LDAPControl_List_DEL(client_ldcs);
12781278

12791279
if (ldaperror != LDAP_SUCCESS)
1280-
return LDAPerror(self->ldap, "ldap_search_ext");
1280+
return LDAPerror(self->ldap);
12811281

12821282
return PyInt_FromLong(msgid);
12831283
}
@@ -1324,7 +1324,7 @@ l_ldap_whoami_s(LDAPObject *self, PyObject *args)
13241324

13251325
if (ldaperror != LDAP_SUCCESS) {
13261326
ber_bvfree(bvalue);
1327-
return LDAPerror(self->ldap, "ldap_whoami_s");
1327+
return LDAPerror(self->ldap);
13281328
}
13291329

13301330
result = LDAPberval_to_unicode_object(bvalue);
@@ -1351,7 +1351,7 @@ l_ldap_start_tls_s(LDAPObject *self, PyObject *args)
13511351
LDAP_END_ALLOW_THREADS(self);
13521352
if (ldaperror != LDAP_SUCCESS) {
13531353
ldap_set_option(self->ldap, LDAP_OPT_ERROR_NUMBER, &ldaperror);
1354-
return LDAPerror(self->ldap, "ldap_start_tls_s");
1354+
return LDAPerror(self->ldap);
13551355
}
13561356

13571357
Py_INCREF(Py_None);
@@ -1443,7 +1443,7 @@ l_ldap_passwd(LDAPObject *self, PyObject *args)
14431443
LDAPControl_List_DEL(client_ldcs);
14441444

14451445
if (ldaperror != LDAP_SUCCESS)
1446-
return LDAPerror(self->ldap, "ldap_passwd");
1446+
return LDAPerror(self->ldap);
14471447

14481448
return PyInt_FromLong(msgid);
14491449
}
@@ -1494,7 +1494,7 @@ l_ldap_extended_operation(LDAPObject *self, PyObject *args)
14941494
LDAPControl_List_DEL(client_ldcs);
14951495

14961496
if (ldaperror != LDAP_SUCCESS)
1497-
return LDAPerror(self->ldap, "ldap_extended_operation");
1497+
return LDAPerror(self->ldap);
14981498

14991499
return PyInt_FromLong(msgid);
15001500
}

‎Modules/constants.c

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ LDAPerr(int errnum)
4949

5050
/* Convert an LDAP error into an informative python exception */
5151
PyObject *
52-
LDAPraise_for_message(LDAP *l, char *msg, LDAPMessage *m)
52+
LDAPraise_for_message(LDAP *l, LDAPMessage *m)
5353
{
5454
if (l == NULL) {
5555
PyErr_SetFromErrno(LDAPexception_class);
@@ -170,10 +170,8 @@ LDAPraise_for_message(LDAP *l, char *msg, LDAPMessage *m)
170170
PyDict_SetItemString(info, "info", str);
171171
Py_XDECREF(str);
172172
}
173-
else if (msg != NULL || (error != NULL && *error != '\0')) {
174-
msg = msg ? msg : error;
175-
176-
str = PyUnicode_FromString(msg);
173+
else if (error != NULL && *error != '\0') {
174+
str = PyUnicode_FromString(error);
177175
if (str)
178176
PyDict_SetItemString(info, "info", str);
179177
Py_XDECREF(str);
@@ -188,9 +186,9 @@ LDAPraise_for_message(LDAP *l, char *msg, LDAPMessage *m)
188186
}
189187

190188
PyObject *
191-
LDAPerror(LDAP *l, char *msg)
189+
LDAPerror(LDAP *l)
192190
{
193-
return LDAPraise_for_message(l, msg, NULL);
191+
return LDAPraise_for_message(l, NULL);
194192
}
195193

196194
/* initialise the module constants */

‎Modules/constants.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ extern int LDAPinit_constants(PyObject *m);
1111
extern PyObject *LDAPconstant(int);
1212

1313
extern PyObject *LDAPexception_class;
14-
extern PyObject *LDAPerror(LDAP *, char *msg);
15-
extern PyObject *LDAPraise_for_message(LDAP *, char *msg, LDAPMessage *m);
14+
extern PyObject *LDAPerror(LDAP *);
15+
extern PyObject *LDAPraise_for_message(LDAP *, LDAPMessage *m);
1616
PyObject *LDAPerr(int errnum);
1717

1818
#ifndef LDAP_CONTROL_PAGE_OID

‎Modules/functions.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ l_ldap_initialize(PyObject *unused, PyObject *args)
2525
PyEval_RestoreThread(save);
2626

2727
if (ret != LDAP_SUCCESS)
28-
return LDAPerror(ld, "ldap_initialize");
28+
return LDAPerror(ld);
2929

3030
return (PyObject *)newLDAPObject(ld);
3131
}

‎Modules/ldapcontrol.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -353,13 +353,13 @@ encode_assertion_control(PyObject *self, PyObject *args)
353353
err = ldap_create(&ld);
354354
PyEval_RestoreThread(save);
355355
if (err != LDAP_SUCCESS)
356-
return LDAPerror(ld, "ldap_create");
356+
return LDAPerror(ld);
357357

358358
err = ldap_create_assertion_control_value(ld, assertion_filterstr,
359359
&ctrl_val);
360360

361361
if (err != LDAP_SUCCESS) {
362-
LDAPerror(ld, "ldap_create_assertion_control_value");
362+
LDAPerror(ld);
363363
save = PyEval_SaveThread();
364364
ldap_unbind_ext(ld, NULL, NULL);
365365
PyEval_RestoreThread(save);

‎Modules/message.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ LDAPmessage_to_python(LDAP *ld, LDAPMessage *m, int add_ctrls,
5353
if (dn == NULL) {
5454
Py_DECREF(result);
5555
ldap_msgfree(m);
56-
return LDAPerror(ld, "ldap_get_dn");
56+
return LDAPerror(ld);
5757
}
5858

5959
attrdict = PyDict_New();
@@ -69,7 +69,7 @@ LDAPmessage_to_python(LDAP *ld, LDAPMessage *m, int add_ctrls,
6969
Py_DECREF(result);
7070
ldap_msgfree(m);
7171
ldap_memfree(dn);
72-
return LDAPerror(ld, "ldap_get_entry_controls");
72+
return LDAPerror(ld);
7373
}
7474

7575
/* convert serverctrls to list of tuples */
@@ -81,7 +81,7 @@ LDAPmessage_to_python(LDAP *ld, LDAPMessage *m, int add_ctrls,
8181
ldap_msgfree(m);
8282
ldap_memfree(dn);
8383
ldap_controls_free(serverctrls);
84-
return LDAPerror(ld, "LDAPControls_to_List");
84+
return LDAPerror(ld);
8585
}
8686
ldap_controls_free(serverctrls);
8787

@@ -201,7 +201,7 @@ LDAPmessage_to_python(LDAP *ld, LDAPMessage *m, int add_ctrls,
201201
Py_DECREF(reflist);
202202
Py_DECREF(result);
203203
ldap_msgfree(m);
204-
return LDAPerror(ld, "ldap_parse_reference");
204+
return LDAPerror(ld);
205205
}
206206
/* convert serverctrls to list of tuples */
207207
if (!(pyctrls = LDAPControls_to_List(serverctrls))) {
@@ -212,7 +212,7 @@ LDAPmessage_to_python(LDAP *ld, LDAPMessage *m, int add_ctrls,
212212
Py_DECREF(result);
213213
ldap_msgfree(m);
214214
ldap_controls_free(serverctrls);
215-
return LDAPerror(ld, "LDAPControls_to_List");
215+
return LDAPerror(ld);
216216
}
217217
ldap_controls_free(serverctrls);
218218
if (refs) {
@@ -255,7 +255,7 @@ LDAPmessage_to_python(LDAP *ld, LDAPMessage *m, int add_ctrls,
255255
0) != LDAP_SUCCESS) {
256256
Py_DECREF(result);
257257
ldap_msgfree(m);
258-
return LDAPerror(ld, "ldap_parse_intermediate");
258+
return LDAPerror(ld);
259259
}
260260
/* convert serverctrls to list of tuples */
261261
if (!(pyctrls = LDAPControls_to_List(serverctrls))) {
@@ -267,7 +267,7 @@ LDAPmessage_to_python(LDAP *ld, LDAPMessage *m, int add_ctrls,
267267
ldap_controls_free(serverctrls);
268268
ldap_memfree(retoid);
269269
ber_bvfree(retdata);
270-
return LDAPerror(ld, "LDAPControls_to_List");
270+
return LDAPerror(ld);
271271
}
272272
ldap_controls_free(serverctrls);
273273

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy