Squash various warnings.

Unused variables, 'may be used unset' or implementations not
matching prototypes.

These show up now as the gcc version on the nodes has increased.

5 files changed, 13 insertions, 14 deletions

diff --git a/base/sha2.c b/base/sha2.c
index 30b333240..50e676afe 100644
--- a/base/sha2.c
+++ b/base/sha2.c
@@ -583,7 +583,7 @@ void pSHA256_Update(SHA256_CTX* context, const sha2_byte *data, size_t len) {
         usedspace = freespace = 0;
 }
 
-void pSHA256_Final(sha2_byte digest[], SHA256_CTX* context) {
+void pSHA256_Final(sha2_byte digest[SHA256_DIGEST_LENGTH], SHA256_CTX* context) {
         sha2_word32	*d = (sha2_word32*)digest;
         unsigned int	usedspace;
 
@@ -646,7 +646,7 @@ void pSHA256_Final(sha2_byte digest[], SHA256_CTX* context) {
         usedspace = 0;
 }
 
-char *pSHA256_End(SHA256_CTX* context, char buffer[]) {
+char *pSHA256_End(SHA256_CTX* context, char buffer[SHA256_DIGEST_STRING_LENGTH]) {
         sha2_byte	digest[SHA256_DIGEST_LENGTH], *d = digest;
         int		i;
 
@@ -944,7 +944,7 @@ void pSHA512_Last(SHA512_CTX* context) {
         pSHA512_Transform(context, (sha2_word64*)context->buffer);
 }
 
-void pSHA512_Final(sha2_byte digest[], SHA512_CTX* context) {
+void pSHA512_Final(sha2_byte digest[SHA512_DIGEST_LENGTH], SHA512_CTX* context) {
         sha2_word64	*d = (sha2_word64*)digest;
 
         /* Sanity check: */
@@ -973,7 +973,7 @@ void pSHA512_Final(sha2_byte digest[], SHA512_CTX* context) {
         MEMSET_BZERO(context, sizeof(*context));
 }
 
-char *pSHA512_End(SHA512_CTX* context, char buffer[]) {
+char *pSHA512_End(SHA512_CTX* context, char buffer[SHA512_DIGEST_STRING_LENGTH]) {
         sha2_byte	digest[SHA512_DIGEST_LENGTH], *d = digest;
         int		i;
 
@@ -1018,7 +1018,7 @@ void pSHA384_Update(SHA384_CTX* context, const sha2_byte* data, size_t len) {
         pSHA512_Update((SHA512_CTX*)context, data, len);
 }
 
-void pSHA384_Final(sha2_byte digest[], SHA384_CTX* context) {
+void pSHA384_Final(sha2_byte digest[SHA384_DIGEST_LENGTH], SHA384_CTX* context) {
         sha2_word64	*d = (sha2_word64*)digest;
 
         /* Sanity check: */
@@ -1047,7 +1047,7 @@ void pSHA384_Final(sha2_byte digest[], SHA384_CTX* context) {
         MEMSET_BZERO(context, sizeof(*context));
 }
 
-char *pSHA384_End(SHA384_CTX* context, char buffer[]) {
+char *pSHA384_End(SHA384_CTX* context, char buffer[SHA384_DIGEST_STRING_LENGTH]) {
         sha2_byte	digest[SHA384_DIGEST_LENGTH], *d = digest;
         int		i;
 
diff --git a/devices/vector/gdevpdfd.c b/devices/vector/gdevpdfd.c
index 273e750af..e2c9c1a07 100644
--- a/devices/vector/gdevpdfd.c
+++ b/devices/vector/gdevpdfd.c
@@ -1418,7 +1418,6 @@ lcvd_fill_trapezoid(gx_device * dev, const gs_fixed_edge * left,
     const gs_fixed_edge * right, fixed ybot, fixed ytop, bool swap_axes,
     const gx_device_color * pdevc, gs_logical_operation_t lop)
 {
-    int code = 0;
     pdf_lcvd_t *cvd = (pdf_lcvd_t *)dev;
 
     if (cvd->mask != NULL)
diff --git a/devices/vector/gdevpdfk.c b/devices/vector/gdevpdfk.c
index 338b039f8..f9f374b96 100644
--- a/devices/vector/gdevpdfk.c
+++ b/devices/vector/gdevpdfk.c
@@ -243,12 +243,12 @@ const pdf_color_space_names_t base_names = {
     PDF_COLOR_SPACE_NAMES
 };
 
-int put_calgray_color_space(gx_device_pdf *pdev, const gs_gstate * pgs, const gs_color_space *pcs, cos_array_t *pca)
+static int put_calgray_color_space(gx_device_pdf *pdev, const gs_gstate * pgs, const gs_color_space *pcs, cos_array_t *pca)
 {
-    int code, i;
+    int code;
     cos_value_t v;
     cos_dict_t *pcd;
-    cos_array_t *WP = NULL, *BP = NULL, *Gamma = NULL, *Matrix;
+    cos_array_t *WP = NULL, *BP = NULL;
 
     pcd = cos_dict_alloc(pdev, "write_calgray_color_space");
     if (pcd == NULL)
@@ -295,9 +295,9 @@ error:
     return code;
 }
 
-int put_calrgb_color_space(gx_device_pdf *pdev, const gs_gstate * pgs, const gs_color_space *pcs, cos_array_t *pca)
+static int put_calrgb_color_space(gx_device_pdf *pdev, const gs_gstate * pgs, const gs_color_space *pcs, cos_array_t *pca)
 {
-    int code, i;
+    int code;
     cos_value_t v;
     cos_dict_t *pcd = NULL;
     cos_array_t *WP = NULL, *BP = NULL, *Gamma = NULL, *Matrix;
@@ -376,7 +376,7 @@ error:
     return code;
 }
 
-int put_lab_color_space(gx_device_pdf *pdev, const gs_gstate * pgs, const gs_color_space *pcs, cos_array_t *pca)
+static int put_lab_color_space(gx_device_pdf *pdev, const gs_gstate * pgs, const gs_color_space *pcs, cos_array_t *pca)
 {
     int code, i;
     cos_value_t v;
diff --git a/psi/zpdfops.c b/psi/zpdfops.c
index 005a41ab2..f7e17c77d 100644
--- a/psi/zpdfops.c
+++ b/psi/zpdfops.c
@@ -1553,7 +1553,6 @@ static int zPDFSetParams(i_ctx_t *i_ctx_p)
 static int zPDFInit(i_ctx_t *i_ctx_p)
 {
     os_ptr op = osp;
-    ref *pdictref = NULL, *pvalueref;
     pdfctx_t *pdfctx = NULL;
     pdf_context *ctx = NULL;
     int code = 0;
diff --git a/psi/zvmem.c b/psi/zvmem.c
index e062c8337..50c2a8249 100644
--- a/psi/zvmem.c
+++ b/psi/zvmem.c
@@ -238,6 +238,7 @@ restore_check_operand(os_ptr op, alloc_save_t ** pasave,
     ulong sid;
     alloc_save_t *asave;
 
+    *pasave = NULL;
     check_type(*op, t_save);
     vmsave = r_ptr(op, vm_save_t);
     if (vmsave == 0)		/* invalidated save */