From bbdd7982563b7d8f89fcd3b7297b5fbdf21fc57f Mon Sep 17 00:00:00 2001 From: iphydf Date: Wed, 14 Dec 2016 09:17:19 +0000 Subject: [PATCH] Fix unresolved reference in toxencryptsave API. Also, make sure this won't happen again by checking for it in format-source. --- other/astyle/format-source | 5 +++++ toxencryptsave/toxencryptsave.api.h | 2 +- toxencryptsave/toxencryptsave.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/other/astyle/format-source b/other/astyle/format-source index b702b488..c6d9982e 100755 --- a/other/astyle/format-source +++ b/other/astyle/format-source @@ -40,6 +40,11 @@ $APIDSL toxcore/tox.api.h > toxcore/tox.h $APIDSL toxav/toxav.api.h > toxav/toxav.h $APIDSL toxencryptsave/toxencryptsave.api.h > toxencryptsave/toxencryptsave.h +if grep '' */*.h; then + echo "error: some apidsl references were unresolved" + exit 1 +fi + SOURCES=`find . -name "*.[ch]" -and -not -name "*.api.h" -and -not -wholename "*crypto_pwhash*" -and -not -wholename "./super_donators/*"` $ASTYLE -n --options=other/astyle/astylerc $SOURCES diff --git a/toxencryptsave/toxencryptsave.api.h b/toxencryptsave/toxencryptsave.api.h index 20b8da06..93456235 100644 --- a/toxencryptsave/toxencryptsave.api.h +++ b/toxencryptsave/toxencryptsave.api.h @@ -49,7 +49,7 @@ extern "C" { * prefer the advanced API and reuse pass-key objects. * * To use the second part, first derive an encryption key from a password with - * ${pass_Key.derive}, then use the derived key to encrypt the data. + * ${tox.pass_Key.derive}, then use the derived key to encrypt the data. * * The encrypted data is prepended with a magic number, to aid validity * checking (no guarantees are made of course). Any data to be decrypted must diff --git a/toxencryptsave/toxencryptsave.h b/toxencryptsave/toxencryptsave.h index 584efaed..de53273e 100644 --- a/toxencryptsave/toxencryptsave.h +++ b/toxencryptsave/toxencryptsave.h @@ -48,7 +48,7 @@ extern "C" { * prefer the advanced API and reuse pass-key objects. * * To use the second part, first derive an encryption key from a password with - * , then use the derived key to encrypt the data. + * tox_pass_key_derive, then use the derived key to encrypt the data. * * The encrypted data is prepended with a magic number, to aid validity * checking (no guarantees are made of course). Any data to be decrypted must