Changeset 1299:820b3044be0f in roaraudio


Ignore:
Timestamp:
03/16/09 04:40:34 (15 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

fixed warnings

Location:
libroar
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • libroar/pinentry.c

    r1268 r1299  
    3636 
    3737int roar_pinentry_open (struct roar_pinentry * pe, int flags, char * display, char * tty, char * term) { 
     38#ifdef ROAR_HAVE_BIN_PINENTRY 
    3839 int in[2], out[2]; 
    3940 
     
    4546 pe->out = -1; 
    4647 
    47 #ifdef ROAR_HAVE_BIN_PINENTRY 
    4848 if ( display == NULL ) 
    4949  display = getenv("DISPLAY"); 
  • libroar/vio_magic.c

    r1298 r1299  
    4040ssize_t roar_vio_magic_read    (struct roar_vio_calls * vio, void *buf, size_t count) { 
    4141 struct roar_vio_magic * self = (struct roar_vio_magic *)(vio->inst); 
     42 struct roar_buffer    * inp; 
    4243 void * calls; 
    4344 size_t len; 
     
    4950  return -1; 
    5051 
    51  if ( roar_buffer_get_len(&(self->inp), &len) == -1 ) 
     52 inp = &(self->inp); 
     53 
     54 if ( roar_buffer_get_len(inp, &len) == -1 ) 
    5255  return -1; 
    5356 
    5457 if ( len ) { 
    5558  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 ) 
    5760   return -1; 
    5861 } 
Note: See TracChangeset for help on using the changeset viewer.