gpgscm: Simplify get-output-string operation.

* tests/gpgscm/scheme.c (opexe_4): Simplify 'get-output-string'.

Signed-off-by: Justus Winter <justus@g10code.com>
This commit is contained in:
Justus Winter 2017-04-04 17:38:50 +02:00
parent d858096c99
commit a80d4a9b50
No known key found for this signature in database
GPG Key ID: DD1A52F9DA8C9020
1 changed files with 6 additions and 14 deletions

View File

@ -4811,20 +4811,12 @@ static pointer opexe_4(scheme *sc, enum scheme_opcodes op) {
port *p; port *p;
if ((p=car(sc->args)->_object._port)->kind&port_string) { if ((p=car(sc->args)->_object._port)->kind&port_string) {
off_t size; gc_disable(sc, 1);
char *str; s_return_enable_gc(
sc,
size=p->rep.string.curr-p->rep.string.start+1; mk_counted_string(sc,
str=sc->malloc(size); p->rep.string.start,
if(str != NULL) { p->rep.string.curr - p->rep.string.start));
pointer s;
memcpy(str,p->rep.string.start,size-1);
str[size-1]='\0';
s=mk_string(sc,str);
sc->free(str);
s_return(sc,s);
}
} }
s_return(sc,sc->F); s_return(sc,sc->F);
} }