--- freem/src/global_bltin.c 2025/04/11 18:24:32 1.20 +++ freem/src/global_bltin.c 2025/04/11 20:55:49 1.21 @@ -1,5 +1,5 @@ /* - * $Id: global_bltin.c,v 1.20 2025/04/11 18:24:32 snw Exp $ + * $Id: global_bltin.c,v 1.21 2025/04/11 20:55:49 snw Exp $ * freem database engine * * @@ -24,6 +24,9 @@ * along with FreeM. If not, see . * * $Log: global_bltin.c,v $ + * Revision 1.21 2025/04/11 20:55:49 snw + * Disable -Wunused-result where possible + * * Revision 1.20 2025/04/11 18:24:32 snw * Fix bug in memory cache * @@ -749,83 +752,62 @@ void global_bltin (short action, char *k register long int k; register long int ch; - j = 0; - + j = 0; hdr_offset = sizeof (global_header); /* process optional limitations */ if (glvnflag.all && key[0] >= '%' && key[0] <= 'z') { if ((i = glvnflag.one[0])) { /* number of significant chars */ - j = 0; while ((k = key[j]) != DELIM && k != EOL) { - if (j >= i) { - while ((k = key[++j]) != DELIM && k != EOL); - stcpy (&key[i], &key[j]); - break; } - j++; - } } if (glvnflag.one[1]) { /* upper/lower sensitivity */ - j = 0; - while ((k = key[j]) != DELIM && k != EOL) { - if (k >= 'a' && k <= 'z') key[j] = k - 32; - j++; - } } if ((i = glvnflag.one[2])) { - if (stlen (key) > i) { merr_raise (M75); return; } /* key length limit */ - } if ((i = glvnflag.one[3])) { /* subscript length limit */ - + j = 0; - while ((k = key[j++]) != DELIM && k != EOL); - + if (k == DELIM) { - k = 0; for (;;) { - k = key[j++]; - if (k == DELIM || k == EOL) { - if (k > i) { merr_raise (M75); return; } - k = 0; } - if (k == EOL) break; k++; } } + } } @@ -888,22 +870,6 @@ void global_bltin (short action, char *k } } - if (v22ptr) { - - procv22 (key); - - if (key[0] != '^') { - char losav[256]; - - stcpy (losav, l_o_val); - symtab (action, key, data); - stcpy (g_o_val, l_o_val); - stcpy (l_o_val, losav); - - return; - } - } - g = gbl_handle (key); i = gbl_path (key, filnam); @@ -968,10 +934,8 @@ void global_bltin (short action, char *k compactkey[k++] = ch << 1; } - else if (ch < SP || ch >= DEL) { - - /*no CTRLs */ - + else if (ch < SP || ch >= DEL) { + /* no CTRLs */ merr_raise (SBSCR); return; }