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

diff --git a/symm/chacha.c b/symm/chacha.c
index 43d23dc7ac5b5be407fe2d5116f5919ec2ccadfe..d64b0d1c878a15cedcfe92afb29e90b6ce7118c6 100644 (file)
--- 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 419b19a4ee3812528138e50f2551f865f504bbd5..490b20598a37df63f6610d004513b80ca25f8d02 100644 (file)
--- 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 3465ad9adf482c96e10ecaa2ca34d20725886add..fb58d36f268b4a1a1c11bedac14b23d07e9709bb 100644 (file)
--- 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 0259172b516055d6cb2f205cde26bc2de07b3c01..7b2d00b28bbb8ffab86617d7fb41351e2c015a6e 100644 (file)
--- 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
  *