X-Git-Url: https://git.openssl.org/?a=blobdiff_plain;f=util%2Ferr-to-raise;h=7ff7a8aa85d5d790b85cdad928423e0261c32fe5;hb=55ca81259a63286a88dd1f53ef14f7830f444c7e;hp=125269fee5a96a1cf65bbfda958462751be8b43a;hpb=f6aca23e268799380e4e4193789ed96db1ed57f3;p=openssl.git diff --git a/util/err-to-raise b/util/err-to-raise index 125269fee5..7ff7a8aa85 100755 --- a/util/err-to-raise +++ b/util/err-to-raise @@ -10,12 +10,8 @@ # perl -pi util/err-to-error files... # or # git ls-files | grep '\.c$' | xargs perl -pi util/err-to-raise - -# There will be some hand-edits necessary, when the second arg was on a -# separate line. This command will find them: -# git grep -E '[A-Z0-9_]+err\(' -# There are about 500 such lines. Another script looks for such things -# and tries to merge lines. +# Consider running util/merge-err-lines first, to catch most (all?) of the +# cases where the XXXerr() call is split into two lines. # Also, what to do about the engines files? This includes: # AFALGerr, CAPIerr, DASYNC, OSSLTEST @@ -46,6 +42,7 @@ s/ENGINEerr\(\w+, *(\w+)\)/ERR_raise(ERR_LIB_ENGINE, $1)/; s/ESSerr\(\w+, *(\w+)\)/ERR_raise(ERR_LIB_ESS, $1)/; s/EVPerr\(\w+, *(\w+)\)/ERR_raise(ERR_LIB_EVP, $1)/; s/FIPSerr\(\w+, *(\w+)\)/ERR_raise(ERR_LIB_FIPS, $1)/; +s/HTTPerr\(\w+, *(\w+)\)/ERR_raise(ERR_LIB_HTTP, $1)/; s/KDFerr\(\w+, *(\w+)\)/ERR_raise(ERR_LIB_KDF, $1)/; s/OBJerr\(\w+, *(\w+)\)/ERR_raise(ERR_LIB_OBJ, $1)/; s/OCSPerr\(\w+, *(\w+)\)/ERR_raise(ERR_LIB_OCSP, $1)/;