From: Mark Wooding <mdw@distorted.org.uk>
Date: Thu, 26 May 2016 08:26:09 +0000 (+0100)
Subject: symm/{chacha,salsa20}.[ch]: Compress systematic naming better in comments.
X-Git-Tag: 2.4.0~42
X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/commitdiff_plain/d022e63003cbac5c60240228c32da9413eb2edb0

symm/{chacha,salsa20}.[ch]: Compress systematic naming better in comments.
---

diff --git a/symm/chacha.c b/symm/chacha.c
index 43d23dc7..d64b0d1c 100644
--- a/symm/chacha.c
+++ b/symm/chacha.c
@@ -184,7 +184,7 @@ void chacha_setnonce(chacha_ctx *ctx, const void *nonce)
   chacha_seek(ctx, 0);
 }
 
-/* --- @chacha_seek@, @chacha_seeku64@ --- *
+/* --- @chacha_seek{,u64}@ --- *
  *
  * Arguments:	@chacha_ctx *ctx@ = pointer to context
  *		@unsigned long i@, @kludge64 i@ = new position to set
@@ -206,7 +206,7 @@ void chacha_seeku64(chacha_ctx *ctx, kludge64 i)
   ctx->bufi = CHACHA_OUTSZ;
 }
 
-/* --- @chacha_tell@, @chacha_tellu64@ --- *
+/* --- @chacha_tell{,u64}@ --- *
  *
  * Arguments:	@chacha_ctx *ctx@ = pointer to context
  *
@@ -415,7 +415,7 @@ CHACHA_VARS(DEFXINIT)
   }
 CHACHA_VARS(DEFXNONCE)
 
-/* --- @xchacha{20,12,8}_seek@, @xchacha{20,12,8}_seeku64@ --- *
+/* --- @xchacha{20,12,8}_seek{,u64}@ --- *
  *
  * Arguments:	@xchachaR_ctx *ctx@ = pointer to context
  *		@unsigned long i@, @kludge64 i@ = new position to set
@@ -432,7 +432,7 @@ CHACHA_VARS(DEFXNONCE)
  *		different.
  */
 
-/* --- @xchacha{20,12,8}_tell@, @xchacha{20,12,8}_tellu64@ --- *
+/* --- @xchacha{20,12,8}_tell{,u64}@ --- *
  *
  * Arguments:	@chacha_ctx *ctx@ = pointer to context
  *
diff --git a/symm/chacha.h b/symm/chacha.h
index 419b19a4..490b2059 100644
--- a/symm/chacha.h
+++ b/symm/chacha.h
@@ -105,7 +105,7 @@ extern void chacha_init(chacha_ctx */*ctx*/,
 
 extern void chacha_setnonce(chacha_ctx */*ctx*/, const void */*nonce*/);
 
-/* --- @chacha_seek@, @chacha_seeku64@ --- *
+/* --- @chacha_seek{,u64}@ --- *
  *
  * Arguments:	@chacha_ctx *ctx@ = pointer to context
  *		@unsigned long i@, @kludge64 i@ = new position to set
@@ -121,7 +121,7 @@ extern void chacha_setnonce(chacha_ctx */*ctx*/, const void */*nonce*/);
 extern void chacha_seek(chacha_ctx */*ctx*/, unsigned long /*i*/);
 extern void chacha_seeku64(chacha_ctx */*ctx*/, kludge64 /*i*/);
 
-/* --- @chacha_tell@, @chacha_tellu64@ --- *
+/* --- @chacha_tell{,u64}@ --- *
  *
  * Arguments:	@chacha_ctx *ctx@ = pointer to context
  *
@@ -229,7 +229,7 @@ extern void xchacha12_setnonce(xchacha12_ctx */*ctx*/,
 extern void xchacha8_setnonce(xchacha8_ctx */*ctx*/,
 			       const void */*nonce*/);
 
-/* --- @xchacha{20,12,8}_seek@, @xchacha{20,12,8}_seeku64@ --- *
+/* --- @xchacha{20,12,8}_seek{,u64}@ --- *
  *
  * Arguments:	@xchachaR_ctx *ctx@ = pointer to context
  *		@unsigned long i@, @kludge64 i@ = new position to set
@@ -253,7 +253,7 @@ extern void xchacha20_seeku64(xchacha20_ctx */*ctx*/, kludge64 /*i*/);
 extern void xchacha12_seeku64(xchacha12_ctx */*ctx*/, kludge64 /*i*/);
 extern void xchacha8_seeku64(xchacha8_ctx */*ctx*/, kludge64 /*i*/);
 
-/* --- @xchacha{20,12,8}_tell@, @xchacha{20,12,8}_tellu64@ --- *
+/* --- @xchacha{20,12,8}_tell{,u64}@ --- *
  *
  * Arguments:	@chacha_ctx *ctx@ = pointer to context
  *
diff --git a/symm/salsa20.c b/symm/salsa20.c
index 3465ad9a..fb58d36f 100644
--- a/symm/salsa20.c
+++ b/symm/salsa20.c
@@ -193,7 +193,7 @@ void salsa20_setnonce(salsa20_ctx *ctx, const void *nonce)
   salsa20_seek(ctx, 0);
 }
 
-/* --- @salsa20_seek@, @salsa20_seeku64@ --- *
+/* --- @salsa20_seek{,u64}@ --- *
  *
  * Arguments:	@salsa20_ctx *ctx@ = pointer to context
  *		@unsigned long i@, @kludge64 i@ = new position to set
@@ -215,7 +215,7 @@ void salsa20_seeku64(salsa20_ctx *ctx, kludge64 i)
   ctx->bufi = SALSA20_OUTSZ;
 }
 
-/* --- @salsa20_tell@, @salsa20_tellu64@ --- *
+/* --- @salsa20_tell{,u64}@ --- *
  *
  * Arguments:	@salsa20_ctx *ctx@ = pointer to context
  *
@@ -435,7 +435,7 @@ SALSA20_VARS(DEFXINIT)
   }
 SALSA20_VARS(DEFXNONCE)
 
-/* --- @xsalsa20{,12,8}_seek@, @xsalsa20{,12,8}_seeku64@ --- *
+/* --- @xsalsa20{,12,8}_seek{,u64}@ --- *
  *
  * Arguments:	@xsalsa20R_ctx *ctx@ = pointer to context
  *		@unsigned long i@, @kludge64 i@ = new position to set
@@ -452,7 +452,7 @@ SALSA20_VARS(DEFXNONCE)
  *		different.
  */
 
-/* --- @xsalsa20{,12,8}_tell@, @xsalsa20{,12,8}_tellu64@ --- *
+/* --- @xsalsa20{,12,8}_tell{,u64}@ --- *
  *
  * Arguments:	@salsa20_ctx *ctx@ = pointer to context
  *
diff --git a/symm/salsa20.h b/symm/salsa20.h
index 0259172b..7b2d00b2 100644
--- a/symm/salsa20.h
+++ b/symm/salsa20.h
@@ -105,7 +105,7 @@ extern void salsa20_init(salsa20_ctx */*ctx*/,
 
 extern void salsa20_setnonce(salsa20_ctx */*ctx*/, const void */*nonce*/);
 
-/* --- @salsa20_seek@, @salsa20_seeku64@ --- *
+/* --- @salsa20_seek{,u64}@ --- *
  *
  * Arguments:	@salsa20_ctx *ctx@ = pointer to context
  *		@unsigned long i@, @kludge64 i@ = new position to set
@@ -121,7 +121,7 @@ extern void salsa20_setnonce(salsa20_ctx */*ctx*/, const void */*nonce*/);
 extern void salsa20_seek(salsa20_ctx */*ctx*/, unsigned long /*i*/);
 extern void salsa20_seeku64(salsa20_ctx */*ctx*/, kludge64 /*i*/);
 
-/* --- @salsa20_tell@, @salsa20_tellu64@ --- *
+/* --- @salsa20_tell{,u64}@ --- *
  *
  * Arguments:	@salsa20_ctx *ctx@ = pointer to context
  *
@@ -229,7 +229,7 @@ extern void xsalsa2012_setnonce(xsalsa2012_ctx */*ctx*/,
 extern void xsalsa208_setnonce(xsalsa208_ctx */*ctx*/,
 			       const void */*nonce*/);
 
-/* --- @xsalsa20{,12,8}_seek@, @xsalsa20{,12,8}_seeku64@ --- *
+/* --- @xsalsa20{,12,8}_seek{,u64}@ --- *
  *
  * Arguments:	@xsalsa20R_ctx *ctx@ = pointer to context
  *		@unsigned long i@, @kludge64 i@ = new position to set
@@ -253,7 +253,7 @@ extern void xsalsa20_seeku64(xsalsa20_ctx */*ctx*/, kludge64 /*i*/);
 extern void xsalsa2012_seeku64(xsalsa2012_ctx */*ctx*/, kludge64 /*i*/);
 extern void xsalsa208_seeku64(xsalsa208_ctx */*ctx*/, kludge64 /*i*/);
 
-/* --- @xsalsa20{,12,8}_tell@, @xsalsa20{,12,8}_tellu64@ --- *
+/* --- @xsalsa20{,12,8}_tell{,u64}@ --- *
  *
  * Arguments:	@salsa20_ctx *ctx@ = pointer to context
  *