Skip to content

Commit b4683d7

Browse files
authored
don't call ERR_clear_error before every OpenSSL call (#289) (#290)
(cherry picked from commit 4a457e5)
1 parent fe4bc89 commit b4683d7

File tree

4 files changed

+0
-147
lines changed

4 files changed

+0
-147
lines changed

cmd/mkcgo/generate.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@ func generateCHeader(src *mkcgo.Source, w io.Writer) {
176176
fmt.Fprintf(w, "typedef void* %s;\n", mkcgoErrState)
177177
fmt.Fprintf(w, "%s mkcgo_err_retrieve();\n", mkcgoErrState)
178178
fmt.Fprintf(w, "void mkcgo_err_free(%s);\n", mkcgoErrState)
179-
fmt.Fprintf(w, "void mkcgo_err_clear();\n\n")
180179

181180
// Add forward declarations for loader functions.
182181
for _, tag := range src.Tags() {
@@ -392,7 +391,6 @@ func generateCFn(typedefs map[string]string, fn *mkcgo.Func, w io.Writer) {
392391
}
393392

394393
fmt.Fprintf(w, "%s %s(%s) {\n", fn.Ret, fnCName(fn), fnCErrWrapperParams(fn, true))
395-
fmt.Fprintf(w, "\tmkcgo_err_clear();\n") // clear any previous error
396394
fmt.Fprintf(w, "\t%s _ret = _g_%s(%s);\n", fn.Ret, fn.ImportName(), fnToCArgs(fn, false, true))
397395
errCond := "<= 0"
398396
if fn.ErrCond != "" {

internal/ossl/errors.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@ typedef struct ossl_err_state_st {
1616
char *file[ERR_NUM_MAX];
1717
} ossl_err_state;
1818
19-
// mkcgo_err_clear clears the error queue in OpenSSL.
20-
void mkcgo_err_clear() {
21-
// Clear the error queue.
22-
_mkcgo_ERR_clear_error();
23-
}
24-
2519
// mkcgo_err_retrieve retrieves the error state from OpenSSL.
2620
// It returns a pointer to a mkcgo_err_state structure
2721
// that contains the error codes, lines, and file names.

0 commit comments

Comments
 (0)