Changeset 1299:820b3044be0f in roaraudio
- Timestamp:
- 03/16/09 04:40:34 (15 years ago)
- Branch:
- default
- Phase:
- public
- Location:
- libroar
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
libroar/pinentry.c
r1268 r1299 36 36 37 37 int roar_pinentry_open (struct roar_pinentry * pe, int flags, char * display, char * tty, char * term) { 38 #ifdef ROAR_HAVE_BIN_PINENTRY 38 39 int in[2], out[2]; 39 40 … … 45 46 pe->out = -1; 46 47 47 #ifdef ROAR_HAVE_BIN_PINENTRY48 48 if ( display == NULL ) 49 49 display = getenv("DISPLAY"); -
libroar/vio_magic.c
r1298 r1299 40 40 ssize_t roar_vio_magic_read (struct roar_vio_calls * vio, void *buf, size_t count) { 41 41 struct roar_vio_magic * self = (struct roar_vio_magic *)(vio->inst); 42 struct roar_buffer * inp; 42 43 void * calls; 43 44 size_t len; … … 49 50 return -1; 50 51 51 if ( roar_buffer_get_len(&(self->inp), &len) == -1 ) 52 inp = &(self->inp); 53 54 if ( roar_buffer_get_len(inp, &len) == -1 ) 52 55 return -1; 53 56 54 57 if ( len ) { 55 58 len = len > count ? count : len; 56 if ( roar_buffer_shift_out(& (self->inp), buf, &len) == -1 )59 if ( roar_buffer_shift_out(&inp, buf, &len) == -1 ) 57 60 return -1; 58 61 }
Note: See TracChangeset
for help on using the changeset viewer.