Check-in by ben on 2025-04-27 21:03:08

Clean up "return value" code

  INSERTED    DELETED
         1          1 src/cache.awk
         2          2 src/cgi.awk
         7          7 src/util.awk
        10         10 TOTAL over 3 changed files

Index: src/cache.awk
==================================================================
--- src/cache.awk
+++ src/cache.awk
@@ -6,11 +6,11 @@
     } else {
         # awk_ext micro-optimization for gawk and mawk:
         # when cache is disabled, print directly to stdout
         cache_output = "/dev/stdout"
     }
-    return retval
+    return
 }
 
 function cache_end(    value) {
     if (cache_enabled || !awk_ext) {
         close(cache_output)

Index: src/cgi.awk
==================================================================
--- src/cgi.awk
+++ src/cgi.awk
@@ -60,11 +60,11 @@
     topdir = parts[2]
 
     return
 }
 
-function gph_encode(str) {
+function gph_encode(str,     retval) {
     retval = str
     gsub(/\|/, "\\|", retval)
     return retval
 }
 
@@ -90,14 +90,14 @@
     uri_encode_tab[127] = sprintf("%%%02X", 127)
 
     return
 }
 
-function uri_encode(str,     i, c, len) {
+function uri_encode(str,     i, c, len, retval) {
     len = length(str)
     retval = ""
     for (i = 1; i <= len; i++) {
         c = substr(str, i, 1)
         retval = retval uri_encode_tab[uri_encode_ord[c]]
     }
     return retval
 }

Index: src/util.awk
==================================================================
--- src/util.awk
+++ src/util.awk
@@ -1,6 +1,6 @@
-function detect_archive(url,     str) {
+function detect_archive(url,     retval, str) {
     str = tolower(url)
     if (str ~ /\.iso$/ ||
         str ~ /\.zip$/)
     {
         retval = 1
@@ -8,11 +8,11 @@
         retval = 0
     }
     return retval
 }
 
-function detect_html(url,     str) {
+function detect_html(url,     retval, str) {
     str = tolower(url)
     if (str ~ /\.html?$/ ||
         str ~ /\.php$/)
     {
         retval = 1
@@ -20,11 +20,11 @@
         retval = 0
     }
     return retval
 }
 
-function detect_image(url,     str) {
+function detect_image(url,     retval, str) {
     str = tolower(url)
     if (str ~ /\.bmp$/  ||
         str ~ /\.gif$/  ||
         str ~ /\.jpg$/  ||
         str ~ /\.jpeg$/ ||
@@ -36,11 +36,11 @@
         retval = 0
     }
     return retval
 }
 
-function gettemp(     result) {
+function gettemp(     result, retval) {
     while ((cmd_mktemp | getline) > 0) {
         retval = $0
     }
     result = close(cmd_mktemp)
     if (result != 0) {
@@ -97,11 +97,11 @@
         }
         A[p] = t
     }
 }
 
-function human_size(bytes) {
+function human_size(bytes,     retval) {
     if (bytes > size_gb) {
         retval = sprintf("%.1fG", bytes / size_gb)
     } else if (bytes > size_mb) { 
         retval = sprintf("%.1fM", bytes / size_mb)
     } else if (bytes > size_kb) { 
@@ -135,20 +135,20 @@
     }
     close(name)
     return retval
 }
 
-function shorten_left(str, len) {
+function shorten_left(str, len,     retval) {
     if (length(str) > len) {
         retval = "..." substr(str, 3 + length(str) - len)
     } else {
         retval = str
     }
     return retval
 }
 
-function shorten(str, len) {
+function shorten(str, len,     retval) {
     if (length(str) > len) {
         retval = substr(str, 0, len - 3) "..."
     } else {
         retval = str
     }