github.com/Interlisp.maiko
1
0
Fork 0
mirror of https://github.com/Interlisp/maiko.git synced 2026-01-27 20:27:45 +00:00
Code Issues Projects Releases Wiki Activity

Rename lisp2c's LispStringLength to LispStringSimpleLength

Browse Source 
Avoid confusion with the LispStringLength definition in locfile.h
    This lisp2c function ONLY looks at the fillpointer for the length.
This commit is contained in:
Nick Briggs
2022-08-14 21:43:48 -07:00
parent 813d2aa2b5
commit 4a02a1a24d
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lisp2c.c
View File

@@ -17,7 +17,7 @@
#include "adr68k.h" // for Addr68k_from_LADDR, LADDR_from_68k
#include "commondefs.h" // for error
#include "emlglob.h"
#include "lisp2cdefs.h" // for CIntToLispInt, LispIntToCInt, LispStringLength
#include "lisp2cdefs.h" // for CIntToLispInt, LispIntToCInt, LispStringSimpleLength
#include "lispemul.h" // for LispPTR
#include "lispmap.h" // for S_NEGATIVE, S_POSITIVE
#include "lspglob.h"
@@ -31,7 +31,7 @@ int LispStringP(LispPTR object) {
return ((type == THIN_CHAR_TYPENUMBER) || (type == FAT_CHAR_TYPENUMBER));
}
int LispStringLength(LispPTR lispstring) {
int LispStringSimpleLength(LispPTR lispstring) {
OneDArray *arrayp;
arrayp = (OneDArray *)(Addr68k_from_LADDR(lispstring));

6
src/mnxmeth.c
View File

@@ -146,7 +146,7 @@ char *gettitlestring(LispPTR medleywin)
if (((MedleyWindow)Cptr(medleywin))->WTITLE == NIL)
titlestring = NULL;
else {
strlen = LispStringLength(((MedleyWindow)Cptr(medleywin))->WTITLE);
strlen = LispStringSimpleLength(((MedleyWindow)Cptr(medleywin))->WTITLE);
titlestring = (char *)malloc(strlen + 1);
LispStringToCStr(((MedleyWindow)Cptr(medleywin))->WTITLE, titlestring);
}
@@ -200,7 +200,7 @@ void setlineattributes(Display *display, DspInterface dspif, WindowInterface wif
}
if (mdash != NIL) {
l = LispStringLength(mdash);
l = LispStringSimpleLength(mdash);
dash_list = (unsigned char *)malloc(l + 1);
LispStringToCStr(mdash, dash_list);
@@ -2797,7 +2797,7 @@ InitDsp(LispArgs args) /* arg[0] = LispPTR to MedleyScreen */
/* if NATIVE_INFO has a string use it for the hostname */
/* else use the environment var DISPLAY or "unix:0.0" */
if (LispStringP(SCREEN->NATIVE_INFO)) {
strlen = LispStringLength(SCREEN->NATIVE_INFO);
strlen = LispStringSimpleLength(SCREEN->NATIVE_INFO);
tmpstring = (char *)alloca(strlen + 1);
LispStringToCStr(SCREEN->NATIVE_INFO, tmpstring);
dspif->handle =