github.com/Interlisp.maiko
1
0
Fork 0
mirror of https://github.com/Interlisp/maiko.git synced 2026-05-01 22:26:50 +00:00
Code Issues Projects Releases Wiki Activity

Cleanups in uutils.c

Browse Source 
Resolve shadow declarations
    Remove deprecated register attribute
    Simplify for-loop syntax, use C99 style loop var declaration
    Make (not used elsewhere) string functions static
This commit is contained in:
Nick Briggs
2022-08-14 11:40:05 -07:00
parent 77ad9204af
commit 1c5881fad4
2 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
inc/uutilsdefs.h
View File

@@ -1,9 +1,6 @@
#ifndef UUTILSDEFS_H #ifndef UUTILSDEFS_H
#define UUTILSDEFS_H 1 #define UUTILSDEFS_H 1
#include <stddef.h> /* for size_t */
#include "lispemul.h" /* for LispPTR */ #include "lispemul.h" /* for LispPTR */
int lisp_string_to_c_string(LispPTR Lisp, char *C, size_t length);
int c_string_to_lisp_string(char *C, LispPTR Lisp);
LispPTR check_unix_password(LispPTR *args); LispPTR check_unix_password(LispPTR *args);
LispPTR unix_username(LispPTR *args); LispPTR unix_username(LispPTR *args);
LispPTR unix_getparm(LispPTR *args); LispPTR unix_getparm(LispPTR *args);

24
src/uutils.c
View File

@@ -22,6 +22,7 @@
#include <pwd.h> // for getpwuid, passwd #include <pwd.h> // for getpwuid, passwd
#endif #endif
#include <signal.h> // for killpg, SIGTSTP #include <signal.h> // for killpg, SIGTSTP
#include <stddef.h> // for size_t
#include <stdio.h> // for printf, NULL, snprintf, size_t #include <stdio.h> // for printf, NULL, snprintf, size_t
#include <stdlib.h> // for getenv #include <stdlib.h> // for getenv
#include <string.h> // for strcmp, strcpy, strlen, strncpy #include <string.h> // for strcmp, strcpy, strlen, strncpy
@@ -45,9 +46,9 @@
/* */ /* */
/************************************************************************/ /************************************************************************/
int lisp_string_to_c_string(LispPTR Lisp, char *C, size_t length) { static int lisp_string_to_c_string(LispPTR Lisp, char *C, size_t length) {
register OneDArray *arrayp; OneDArray *arrayp;
register char *base; char *base;
if (GetTypeNumber(Lisp) != TYPE_ONED_ARRAY) { return (-1); } if (GetTypeNumber(Lisp) != TYPE_ONED_ARRAY) { return (-1); }
@@ -61,9 +62,9 @@ int lisp_string_to_c_string(LispPTR Lisp, char *C, size_t length) {
strncpy(C, base, arrayp->fillpointer); strncpy(C, base, arrayp->fillpointer);
#else #else
{ {
register int i, length; size_t l = arrayp->fillpointer;
register char *dp; char *dp = C;
for (i = 0, dp = C, length = arrayp->fillpointer; i < length; i++) { for (size_t i = 0; i < l; i++) {
*dp++ = (char)(GETBYTE(base++)); *dp++ = (char)(GETBYTE(base++));
} }
} }
@@ -87,10 +88,10 @@ int lisp_string_to_c_string(LispPTR Lisp, char *C, size_t length) {
/* */ /* */
/************************************************************************/ /************************************************************************/
int c_string_to_lisp_string(char *C, LispPTR Lisp) { static int c_string_to_lisp_string(char *C, LispPTR Lisp) {
register OneDArray *arrayp; OneDArray *arrayp;
char *base; char *base;
register size_t length; size_t length;
length = strlen(C); length = strlen(C);
if (GetTypeNumber(Lisp) != TYPE_ONED_ARRAY) { return (-1); } if (GetTypeNumber(Lisp) != TYPE_ONED_ARRAY) { return (-1); }
@@ -106,9 +107,8 @@ int c_string_to_lisp_string(char *C, LispPTR Lisp) {
strcpy(base, C); strcpy(base, C);
#else #else
{ {
register size_t i; char *dp = C;
register char *dp; for (size_t i = 0; i < length + 1; i++) {
for (i = 0, dp = C; i < length + 1; i++) {
char ch = *dp++; char ch = *dp++;
#ifdef DOS #ifdef DOS
if (ch == '\\') dp++; /* skip 2nd \ in \\ in C strings */ if (ch == '\\') dp++; /* skip 2nd \ in \\ in C strings */