Changeset 962

Show
Ignore:
Timestamp:
03/19/08 05:55:31 (13 years ago)
Author:
ppalmers
Message:

apply patch of ticket #82

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado/external/dbus/src/dispatcher.cpp

    r562 r962  
    6767int Watch::descriptor() const 
    6868{ 
    69         return dbus_watch_get_fd((DBusWatch*)_int); 
     69        return dbus_watch_get_unix_fd((DBusWatch*)_int); 
    7070} 
    7171 
  • trunk/libffado/external/dbus/tools/xml2cpp.cpp

    r562 r962  
    8484const char* atomic_type_to_string( char t ) 
    8585{ 
    86         static struct { char type; char* name; } atos[] = 
     86        static struct { const char type; const char *name; } atos[] = 
    8787        { 
    8888                { 'y', "::DBus::Byte" }, 
  • trunk/libffado/src/libavc/avc_definitions.cpp

    r864 r962  
    118118std::ostream& operator<<( std::ostream& stream, ESamplingFrequency samplingFrequency ) 
    119119{ 
    120     char* str; 
     120    std::string str; 
    121121    switch ( samplingFrequency ) { 
    122122    case eSF_22050Hz: 
  • trunk/libffado/src/libieee1394/cycletimer.h

    r879 r962  
    143143    if (x < 0) { 
    144144        x += TICKS_PER_SECOND * 128L; 
    145     } else if (x >= TICKS_PER_SECOND * 128L) { 
     145    } else if (x >= (int64_t)(TICKS_PER_SECOND * 128L)) { 
    146146        x -= TICKS_PER_SECOND * 128L; 
    147147    } 
    148148 
    149149#ifdef DEBUG 
    150         if (x >= TICKS_PER_SECOND * 128L) { 
     150        if (x >= (int64_t)(TICKS_PER_SECOND * 128L)) { 
    151151            debugWarning("insufficient wrapping (max): %llu\n",x); 
    152152        } 
  • trunk/libffado/src/maudio/maudio_avdevice.h

    r864 r962  
    4747    unsigned int vendor_id; 
    4848    unsigned int model_id; 
    49     char *vendor_name; 
    50     char *model_name; 
    51     char *filename; 
     49    const char *vendor_name; 
     50    const char *model_name; 
     51    const char *filename; 
    5252}; 
    5353 
  • trunk/libffado/src/motu/motu_avdevice.h

    r949 r962  
    106106    unsigned int unit_specifier_id; 
    107107    enum EMotuModel model; 
    108     char *vendor_name; 
    109     char *model_name; 
     108    const char *vendor_name; 
     109    const char *model_name; 
    110110}; 
    111111 
    112112struct PortEntry { 
    113     char *port_name; 
     113    const char *port_name; 
    114114    unsigned int port_dir; 
    115115    unsigned int port_flags; 
  • trunk/libffado/support/dbus/ffado-dbus-server.cpp

    r960 r962  
    9595    int   node_id; 
    9696    int   node_id_set; 
    97     char* args[2]; 
     97    const char* args[2]; 
    9898}; 
    9999 
  • trunk/libffado/support/firmware/bridgeco-downloader.cpp

    r900 r962  
    3939const char *argp_program_version = "bridgeco-downloader 0.2"; 
    4040const char *argp_program_bug_address = "<ffado-devel@lists.sf.net>"; 
    41 char* doc = "bridgeco-downloader -- firmware downloader application for BridgeCo devices\n\n" 
     41const char *doc = "bridgeco-downloader -- firmware downloader application for BridgeCo devices\n\n" 
    4242                    "OPERATION: display\n" 
    4343                    "           setguid GUID\n" 
  • trunk/libffado/support/firmware/downloader.cpp

    r900 r962  
    4040static struct argp _argp = { options, parse_opt, args_doc, doc };  
    4141struct argp* argp = &_argp; 
    42 static struct arguments _args = { 0, }; 
     42static struct arguments _args = { {0}, }; 
    4343struct arguments* args = &_args; 
    4444 
  • trunk/libffado/support/firmware/downloader.h

    r900 r962  
    2929/* ------------------------------------- */ 
    3030/* has to be provided by the application */ 
    31 extern char *doc; 
     31extern const char *doc; 
    3232extern struct argp_option* options; 
    3333 
  • trunk/libffado/support/firmware/fireworks-downloader.cpp

    r900 r962  
    4949const char *argp_program_version = "fireworks-downloader 0.2"; 
    5050const char *argp_program_bug_address = "<ffado-devel@lists.sf.net>"; 
    51 char* doc = "fireworks-downloader -- firmware downloader application for ECHO Fireworks devices\n\n" 
     51const char *doc = "fireworks-downloader -- firmware downloader application for ECHO Fireworks devices\n\n" 
    5252                    "OPERATION: display\n" 
    5353                    "           firmware FILE\n"; 
  • trunk/libffado/tests/dumpiso_mod.cpp

    r907 r962  
    5353void parse_args(int argc, char **argv) 
    5454{ 
    55         int i; 
    5655        char *tail; 
    57         unsigned long chan1, chan2; 
     56        unsigned long i, chan1, chan2; 
    5857 
    5958        int c; 
     
    245244 
    246245        fprintf(stderr, "port: %ld\nchannels: %#016llx\nfile: %s\n", which_port, 
    247                 listen_channels, filename); 
     246                (long long unsigned int)(listen_channels), filename); 
    248247 
    249248        handle = raw1394_new_handle(); 
     
    258257 
    259258        do { 
    260                 if (raw1394_get_port_info(handle, NULL, 0) <= which_port) { 
     259                if ((unsigned long)(raw1394_get_port_info(handle, NULL, 0)) <= which_port) { 
    261260                        fprintf(stderr, "Port %ld does not exist.\n", 
    262261                                which_port); 
  • trunk/libffado/tests/test-ffado.cpp

    r866 r962  
    7474    long int node_id; 
    7575    long int node_id_set; 
    76     char* args[2]; 
     76    const char* args[2]; 
    7777}; 
    7878