From 31f4fada5bc8d7a781545036f1613bd00ffa1498 Mon Sep 17 00:00:00 2001 From: aj Date: Thu, 7 Dec 2006 10:53:37 +0000 Subject: [PATCH] define these constants where used to kill warnings. git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3069 c6295689-39f2-0310-b995-f0e70906c6a9 --- src/libopensc/muscle-filesystem.c | 1 + src/libopensc/muscle-filesystem.h | 4 ---- src/libopensc/muscle.c | 3 +++ 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libopensc/muscle-filesystem.c b/src/libopensc/muscle-filesystem.c index 08137b4c..130d81ca 100644 --- a/src/libopensc/muscle-filesystem.c +++ b/src/libopensc/muscle-filesystem.c @@ -29,6 +29,7 @@ #define MSCFS_FILE_NOT_FOUND SC_ERROR_FILE_NOT_FOUND #define MSCFS_CACHE_INCREMENT 128 +static msc_id rootId = { { 0x3F, 0x00, 0x3F, 0x00 } }; static const u8* ignoredFiles[] = { (const u8*)"l0\0\0", diff --git a/src/libopensc/muscle-filesystem.h b/src/libopensc/muscle-filesystem.h index c2b5e139..e4240b6c 100644 --- a/src/libopensc/muscle-filesystem.h +++ b/src/libopensc/muscle-filesystem.h @@ -30,10 +30,6 @@ typedef struct msc_id { } msc_id; -static msc_id inputId = { { 0xFF, 0xFF, 0xFF, 0xFF } }; -static msc_id outputId = { { 0xFF, 0xFF, 0xFF, 0xFE } }; -static msc_id rootId = { { 0x3F, 0x00, 0x3F, 0x00 } }; - typedef struct mscfs_file { msc_id objectId; size_t size; diff --git a/src/libopensc/muscle.c b/src/libopensc/muscle.c index fce82830..bbbe9197 100644 --- a/src/libopensc/muscle.c +++ b/src/libopensc/muscle.c @@ -41,6 +41,9 @@ #define MIN(x, y) (((x) < (y)) ? (x) : (y)) #endif +static msc_id inputId = { { 0xFF, 0xFF, 0xFF, 0xFF } }; +static msc_id outputId = { { 0xFF, 0xFF, 0xFF, 0xFE } }; + int msc_list_objects(sc_card_t* card, u8 next, mscfs_file_t* file) { sc_apdu_t apdu; u8 fileData[14];