diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

we usually are not sure how best to pass encoding: pass by ref

Browse Source
This commit is contained in:
Vítor Santos Costa 2015-10-08 02:12:06 +01:00
parent 3192e094af
commit e8ed525e3b
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
C/c_interface.c
View File

@ -1895,7 +1895,7 @@ YAP_ReadBuffer(const char *s, Term *tp)
BACKUP_H(); BACKUP_H();
LOCAL_ErrorMessage=NULL; LOCAL_ErrorMessage=NULL;
while (!(t = Yap_StringToTerm(s, strlen(s)+1, LOCAL_encoding, 1200, tp))) { while (!(t = Yap_StringToTerm(s, strlen(s)+1, &LOCAL_encoding, 1200, tp))) {
if (LOCAL_ErrorMessage) { if (LOCAL_ErrorMessage) {
if (!strcmp(LOCAL_ErrorMessage,"Stack Overflow")) { if (!strcmp(LOCAL_ErrorMessage,"Stack Overflow")) {
if (!Yap_dogc( 0, NULL PASS_REGS )) { if (!Yap_dogc( 0, NULL PASS_REGS )) {
@ -2745,7 +2745,7 @@ YAP_WriteBuffer(Term t, char *buf, size_t sze, int flags)
char *b; char *b;
BACKUP_MACHINE_REGS(); BACKUP_MACHINE_REGS();
if ((b = Yap_TermToString(t, buf, sze, &length,LOCAL_encoding, flags)) != buf) { if ((b = Yap_TermToString(t, buf, sze, &length, &LOCAL_encoding, flags)) != buf) {
if (b) free(b); if (b) free(b);
RECOVER_MACHINE_REGS(); RECOVER_MACHINE_REGS();
return FALSE; return FALSE;
@ -2755,12 +2755,13 @@ YAP_WriteBuffer(Term t, char *buf, size_t sze, int flags)
} }
X_API char * X_API char *
YAP_WriteDynamicBuffer(Term t, char *buf, size_t sze, size_t *lengthp, int *encp, int flags) YAP_WriteDynamicBuffer(YAP_Term t, char *buf, size_t sze, size_t *lengthp, encoding_t
*encp, int flags)
{ {
char *b; char *b;
BACKUP_MACHINE_REGS(); BACKUP_MACHINE_REGS();
b = Yap_TermToString(t, buf, sze, lengthp, *encp, flags); b = Yap_TermToString(t, buf, sze, lengthp, encp, flags);
RECOVER_MACHINE_REGS(); RECOVER_MACHINE_REGS();
return b; return b;
} }