Changeset 2950 for releases

Show
Ignore:
Timestamp:
05/12/06 20:01:50 (3 years ago)
Author:
aj
Message:

compile fixes for win32.

Location:
releases/opensc-0.11.1/src
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • releases/opensc-0.11.1/src/libopensc/card-mcrd.c

    r2927 r2950  
    964964                unsigned short int pathtmp[SC_MAX_PATH_SIZE / 2]; 
    965965                unsigned short int *pathptr; 
    966  
     966                int samepath = 1; 
    967967                size_t pathlen, n; 
     968 
    968969                if ((path->len & 1) || path->len > sizeof(pathtmp)) 
    969970                        return SC_ERROR_INVALID_ARGUMENTS; 
    … …  
    974975                            (path->value[n] << 8) | path->value[n + 1]; 
    975976                pathlen = path->len >> 1; 
    976  
    977                 int samepath = 1; 
    978977 
    979978                if (pathlen == priv->curpathlen && priv->is_ef != 2) { 
    … …  
    10391038        char tmpstr[16] = ""; 
    10401039        char currpathpart[10]; 
     1040        sc_path_t tmppath; 
    10411041        struct mcrd_priv_data *priv = DRVDATA(card); 
    10421042        memset(tmpstr, 0, 16); 
    … …  
    10491049        } 
    10501050 
    1051         sc_path_t tmppath; 
    10521051        sc_format_path(tmpstr, &tmppath); 
    10531052        tmppath.type = SC_PATH_TYPE_PATH; 

  • releases/opensc-0.11.1/src/pkcs11/framework-pkcs15.c

    r2943 r2950  
    24772477        unsigned int    n; 
    24782478        size_t          len2; 
     2479        size_t          lenb = 1; 
    24792480 
    24802481        len2 = len; 
    24812482        /* calculate the number of bytes needed for the length */ 
    2482         size_t lenb = 1; 
    24832483        if (len > 127) { 
    24842484                unsigned int i;