Fix more doxygen bitrot

This commit is contained in:
Viktor Dukhovni
2016-12-15 02:43:59 -05:00
parent 2cc59accca
commit 3657f23a9e
6 changed files with 14 additions and 31 deletions

View File

@@ -74,7 +74,11 @@ doxyout doxygen: base.dxy hdb.dxy hx509.dxy hcrypto.dxy gssapi.dxy krb5.dxy ntlm
for a in $(PROJECTS) ; do \ for a in $(PROJECTS) ; do \
echo $$a ; \ echo $$a ; \
doxygen $$a.dxy; \ doxygen $$a.dxy; \
(cd $(srcdir)/doxyout && find $$a/man -type f -name _\* | perl -lne unlink && \ (cd $(srcdir)/doxyout && \
find $$a/man -name '_*' -type f -print | \
perl -lne unlink && \
find $$a/html -name 'dir_*.html' -type f -print | \
perl -lne unlink && \
find $$a/man -type f > $$a/manpages ) ; \ find $$a/man -type f > $$a/manpages ) ; \
done done

View File

@@ -26,7 +26,6 @@ SHORT_NAMES = NO
JAVADOC_AUTOBRIEF = NO JAVADOC_AUTOBRIEF = NO
QT_AUTOBRIEF = NO QT_AUTOBRIEF = NO
MULTILINE_CPP_IS_BRIEF = NO MULTILINE_CPP_IS_BRIEF = NO
DETAILS_AT_TOP = NO
INHERIT_DOCS = YES INHERIT_DOCS = YES
SEPARATE_MEMBER_PAGES = NO SEPARATE_MEMBER_PAGES = NO
TAB_SIZE = 8 TAB_SIZE = 8
@@ -65,7 +64,6 @@ GENERATE_DEPRECATEDLIST= YES
ENABLED_SECTIONS = ENABLED_SECTIONS =
MAX_INITIALIZER_LINES = 30 MAX_INITIALIZER_LINES = 30
SHOW_USED_FILES = YES SHOW_USED_FILES = YES
SHOW_DIRECTORIES = NO
FILE_VERSION_FILTER = FILE_VERSION_FILTER =
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# configuration options related to warning and progress messages # configuration options related to warning and progress messages
@@ -105,8 +103,7 @@ FILE_PATTERNS = *.c \
*.inc \ *.inc \
*.m \ *.m \
*.mm \ *.mm \
*.dox \ *.dox
*.py
RECURSIVE = YES RECURSIVE = YES
EXCLUDE = EXCLUDE =
EXCLUDE_SYMLINKS = NO EXCLUDE_SYMLINKS = NO
@@ -142,7 +139,6 @@ GENERATE_HTML = YES
HTML_OUTPUT = html HTML_OUTPUT = html
HTML_FILE_EXTENSION = .html HTML_FILE_EXTENSION = .html
HTML_STYLESHEET = HTML_STYLESHEET =
HTML_ALIGN_MEMBERS = YES
GENERATE_HTMLHELP = NO GENERATE_HTMLHELP = NO
HTML_DYNAMIC_SECTIONS = NO HTML_DYNAMIC_SECTIONS = NO
CHM_FILE = CHM_FILE =
@@ -190,8 +186,6 @@ MAN_LINKS = YES
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
GENERATE_XML = NO GENERATE_XML = NO
XML_OUTPUT = xml XML_OUTPUT = xml
XML_SCHEMA =
XML_DTD =
XML_PROGRAMLISTING = YES XML_PROGRAMLISTING = YES
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# configuration options for the AutoGen Definitions output # configuration options for the AutoGen Definitions output
@@ -227,7 +221,6 @@ EXTERNAL_GROUPS = YES
# Configuration options related to the dot tool # Configuration options related to the dot tool
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
CLASS_DIAGRAMS = NO CLASS_DIAGRAMS = NO
MSCGEN_PATH = /usr/bin
HIDE_UNDOC_RELATIONS = YES HIDE_UNDOC_RELATIONS = YES
HAVE_DOT = YES HAVE_DOT = YES
CLASS_GRAPH = YES CLASS_GRAPH = YES
@@ -242,7 +235,6 @@ CALLER_GRAPH = NO
GRAPHICAL_HIERARCHY = YES GRAPHICAL_HIERARCHY = YES
DIRECTORY_GRAPH = YES DIRECTORY_GRAPH = YES
DOT_IMAGE_FORMAT = png DOT_IMAGE_FORMAT = png
DOT_PATH = /usr/bin
DOTFILE_DIRS = DOTFILE_DIRS =
DOT_GRAPH_MAX_NODES = 50 DOT_GRAPH_MAX_NODES = 50
MAX_DOT_GRAPH_DEPTH = 1000 MAX_DOT_GRAPH_DEPTH = 1000

View File

@@ -320,8 +320,8 @@ hx509_certs_end_seq(hx509_context context,
} }
/** /**
* Iterate over all certificates in a keystore and call an function * Iterate over all certificates in a keystore and call a function
* for each fo them. * for each of them.
* *
* @param context a hx509 context. * @param context a hx509 context.
* @param certs certificate store to iterate over. * @param certs certificate store to iterate over.
@@ -368,21 +368,6 @@ hx509_certs_iter_f(hx509_context context,
return ret; return ret;
} }
/**
* Iterate over all certificates in a keystore and call an function
* for each fo them.
*
* @param context a hx509 context.
* @param certs certificate store to iterate over.
* @param func function to call for each certificate. The function
* should return non-zero to abort the iteration, that value is passed
* back to the caller of hx509_certs_iter().
*
* @return Returns an hx509 error code.
*
* @ingroup hx509_keyset
*/
#ifdef __BLOCKS__ #ifdef __BLOCKS__
static int static int
@@ -393,8 +378,8 @@ certs_iter(hx509_context context, void *ctx, hx509_cert cert)
} }
/** /**
* Iterate over all certificates in a keystore and call an block * Iterate over all certificates in a keystore and call a block
* for each fo them. * for each of them.
* *
* @param context a hx509 context. * @param context a hx509 context.
* @param certs certificate store to iterate over. * @param certs certificate store to iterate over.

View File

@@ -1053,6 +1053,7 @@ krb5_set_default_in_tkt_etypes(krb5_context context,
* with the KDC, clients and servers. * with the KDC, clients and servers.
* *
* @param context Kerberos 5 context. * @param context Kerberos 5 context.
* @param pdu_type request type (AS, TGS or none)
* @param etypes Encryption types, array terminated with * @param etypes Encryption types, array terminated with
* ETYPE_NULL(0), caller should free array with krb5_xfree(): * ETYPE_NULL(0), caller should free array with krb5_xfree():
* *
@@ -1073,7 +1074,7 @@ krb5_get_default_in_tkt_etypes(krb5_context context,
heim_assert(pdu_type == KRB5_PDU_AS_REQUEST || heim_assert(pdu_type == KRB5_PDU_AS_REQUEST ||
pdu_type == KRB5_PDU_TGS_REQUEST || pdu_type == KRB5_PDU_TGS_REQUEST ||
pdu_type == KRB5_PDU_NONE, "pdu contant not as expected"); pdu_type == KRB5_PDU_NONE, "unexpected pdu type");
if (pdu_type == KRB5_PDU_AS_REQUEST && context->as_etypes != NULL) if (pdu_type == KRB5_PDU_AS_REQUEST && context->as_etypes != NULL)
enctypes = context->as_etypes; enctypes = context->as_etypes;

View File

@@ -281,6 +281,7 @@ krb5_vabort(krb5_context context, krb5_error_code code,
* @param context A Kerberos 5 context * @param context A Kerberos 5 context
* @param code error code of the last error * @param code error code of the last error
* @param fmt message to print * @param fmt message to print
* @param ... arguments for format string
* *
* @ingroup krb5_error * @ingroup krb5_error
*/ */

View File

@@ -1054,6 +1054,7 @@ out:
* *
* @param type3 the ntlm_type3 message to encode. * @param type3 the ntlm_type3 message to encode.
* @param data is the return buffer with the encoded message, should be * @param data is the return buffer with the encoded message, should be
* @param[out] mic_offset offset of message integrity code
* freed with heim_ntlm_free_buf(). * freed with heim_ntlm_free_buf().
* *
* @return In case of success 0 is return, an errors, a errno in what * @return In case of success 0 is return, an errors, a errno in what
@@ -1580,7 +1581,6 @@ heim_ntlm_ts2unixtime(uint64_t t)
* @param username name of the user, as sent in the message, assumed to be in UTF8. * @param username name of the user, as sent in the message, assumed to be in UTF8.
* @param target the name of the target, assumed to be in UTF8. * @param target the name of the target, assumed to be in UTF8.
* @param serverchallenge challenge as sent by the server in the type2 message. * @param serverchallenge challenge as sent by the server in the type2 message.
* @param infotarget infotarget as sent by the server in the type2 message.
* @param ntlmv2 calculated session key * @param ntlmv2 calculated session key
* @param answer ntlm response answer, should be freed with heim_ntlm_free_buf(). * @param answer ntlm response answer, should be freed with heim_ntlm_free_buf().
* *