Changeset 3177

Timestamp:

06/21/07 10:07:01 (19 months ago)

Author:

aj

Message:

fix compiler/sparse warnings.

Location:

trunk/src

Files:

• common/strlcpy.c (modified) (1 diff)
• libopensc/card-belpic.c (modified) (4 diffs)
• libopensc/card-cardos.c (modified) (1 diff)
• libopensc/card-gpk.c (modified) (3 diffs)
• libopensc/card-incrypto34.c (modified) (7 diffs)
• libopensc/card-jcop.c (modified) (3 diffs)
• libopensc/card-mcrd.c (modified) (1 diff)
• libopensc/card-oberthur.c (modified) (2 diffs)
• libopensc/card.c (modified) (1 diff)
• libopensc/muscle-filesystem.c (modified) (1 diff)
• libopensc/opensc.h (modified) (3 diffs)
• libopensc/pkcs15-prkey.c (modified) (1 diff)
• libopensc/pkcs15-syn.c (modified) (1 diff)
• libopensc/pkcs15.c (modified) (1 diff)
• libopensc/reader-openct.c (modified) (8 diffs)
• libopensc/sc.c (modified) (3 diffs)
• libopensc/ui.c (modified) (5 diffs)
• scconf/test-conf.c (modified) (1 diff)

trunk/src/common/strlcpy.c

@@ -22 +22 @@
 #include <sys/types.h>
 #include <string.h>
+
+#include "strlcpy.h"
 
 /*

trunk/src/libopensc/card-belpic.c

@@ -423 +423 @@
 };
 
-static inline void TLVInit(struct tTLV *tlv, u8 * base, size_t size)
+static void TLVInit(struct tTLV *tlv, u8 * base, size_t size)
 {
         tlv->base = base;
@@ -430 +430 @@
 }
 
-static inline void TLVNext(struct tTLV *tlv, u8 tag)
+static void TLVNext(struct tTLV *tlv, u8 tag)
 {
         assert(tlv->next + 2 < tlv->end);
@@ -438 +438 @@
 }
 
-static inline void TLVAdd(struct tTLV *tlv, u8 val)
+static void TLVAdd(struct tTLV *tlv, u8 val)
 {
         assert(tlv->next + 1 < tlv->end);
@@ -445 +445 @@
 }
 
-static inline void TLVAddBuffer(struct tTLV *tlv, u8 * val, size_t size)
+static void TLVAddBuffer(struct tTLV *tlv, u8 * val, size_t size)
 {
         assert(tlv->next + size < tlv->end);

trunk/src/libopensc/card-cardos.c

@@ -31 +31 @@
 static const struct sc_card_operations *iso_ops = NULL;
 
-struct sc_card_operations cardos_ops;
+static struct sc_card_operations cardos_ops;
 static struct sc_card_driver cardos_drv = {
         "Siemens CardOS",

trunk/src/libopensc/card-gpk.c

@@ -1665 +1665 @@
  * GetInfo call
  */
-int
-gpk_get_info(sc_card_t *card, int p1, int p2, u8 *buf, size_t buflen)
+static int gpk_get_info(sc_card_t *card, int p1, int p2, u8 *buf,
+                size_t buflen)
 {
         sc_apdu_t       apdu;
@@ -1871 +1871 @@
  */
 static struct sc_card_driver *
-sc_get_driver()
+sc_get_driver(void)
 {
         struct sc_card_driver *iso_drv;
@@ -1899 +1899 @@
 
 struct sc_card_driver *
-sc_get_gpk_driver()
+sc_get_gpk_driver(void)
 {
         return sc_get_driver();

trunk/src/libopensc/card-incrypto34.c

@@ -35 +35 @@
 static const struct sc_card_operations *iso_ops = NULL;
 
-struct sc_card_operations incrypto34_ops;
-struct sc_card_driver incrypto34_drv = {
+static struct sc_card_operations incrypto34_ops;
+static struct sc_card_driver incrypto34_drv = {
         "Incard Incripto34",
         "incrypto34",
@@ -50 +50 @@
 };
 
-int incrypto34_finish(struct sc_card *card)
+static int incrypto34_finish(struct sc_card *card)
 {
         return 0;
 }
 
-int incrypto34_match_card(struct sc_card *card)
+static int incrypto34_match_card(struct sc_card *card)
 {
         int i;
@@ -65 +65 @@
 }
 
-int incrypto34_init(sc_card_t *card)
+static int incrypto34_init(sc_card_t *card)
 {
         unsigned long   flags;
@@ -165 +165 @@
 }
 
-
-int incrypto34_list_files(sc_card_t *card, u8 *buf, size_t buflen)
+static int incrypto34_list_files(sc_card_t *card, u8 *buf, size_t buflen)
 {
         sc_apdu_t apdu;
@@ -415 +414 @@
  * Restore the indicated SE
  */
-static int
-incrypto34_restore_security_env(sc_card_t *card, int se_num)
+static int incrypto34_restore_security_env(sc_card_t *card, int se_num)
 {
         sc_apdu_t apdu;
@@ -444 +442 @@
  * XXX Need to find out how the Aladdin drivers do it.
  */
-static int
-incrypto34_set_security_env(sc_card_t *card,
-                            const sc_security_env_t *env,
-                            int se_num)
+static int incrypto34_set_security_env(sc_card_t *card,
+                    const sc_security_env_t *env, int se_num)
 {
         sc_apdu_t apdu;
@@ -497 +493 @@
 
 /* internal function to do the actual signature computation */
-static int
-do_compute_signature(sc_card_t *card, const u8 *data, size_t datalen,
-                     u8 *out, size_t outlen)
+static int do_compute_signature(sc_card_t *card,
+                const u8 *data, size_t datalen, u8 *out, size_t outlen)
 {
         int r;

trunk/src/libopensc/card-jcop.c

@@ -109 +109 @@
      drvdata->invalid_senv=1;
      drvdata->nfiles=-1;
-     drvdata->filelist=0;
+     drvdata->filelist=NULL;
      f=sc_file_new();
      if (!f){
@@ -429 +429 @@
                drvdata->nfiles=-1;
                free(drvdata->filelist);
-               drvdata->filelist=0;
+               drvdata->filelist=NULL;
           }
           if(file->sec_attr_len >=3) {
@@ -460 +460 @@
                drvdata->nfiles=0;
                free(drvdata->filelist);
-               drvdata->filelist=0;
+               drvdata->filelist=NULL;
           }    
           /* the format of the poprietary attributes is:

trunk/src/libopensc/card-mcrd.c

@@ -1057 +1057 @@
 }
 
-int select_key_df(sc_card_t * card)
+static int select_key_df(sc_card_t * card)
 {
         int r;

trunk/src/libopensc/card-oberthur.c

@@ -87 +87 @@
 
 
-const unsigned char *aidAuthentIC_V5 = 
+static const unsigned char *aidAuthentIC_V5 = 
                 (const u8 *)"\xA0\x00\x00\x00\x77\x01\x03\x03\x00\x00\x00\xF1\x00\x00\x00\x02";
-const int lenAidAuthentIC_V5 = 16; 
-const char *nameAidAuthentIC_V5 = "AuthentIC v5"; 
+static const int lenAidAuthentIC_V5 = 16; 
+static const char *nameAidAuthentIC_V5 = "AuthentIC v5"; 
 
 #define AUTH_PIN                1
@@ -144 +144 @@
 #endif
 
-void _auth_print_acls(struct sc_card *card, struct sc_file *file)
+static void _auth_print_acls(struct sc_card *card, struct sc_file *file)
 {
         int ii, jj;   

trunk/src/libopensc/card.c

@@ -653 +653 @@
 }
 
-inline int sc_card_valid(const sc_card_t *card) {
+int sc_card_valid(const sc_card_t *card) {
 #ifndef NDEBUG
         assert(card != NULL);

trunk/src/libopensc/muscle-filesystem.c

@@ -38 +38 @@
 };
 
-mscfs_t *mscfs_new() {
+mscfs_t *mscfs_new(void) {
         mscfs_t *fs = (mscfs_t*)malloc(sizeof(mscfs_t));
         memset(fs, 0, sizeof(mscfs_t));

trunk/src/libopensc/opensc.h

@@ -40 +40 @@
 #include <opensc/errors.h>
 #include <opensc/types.h>
-
-#ifndef __GNUC__
-#undef inline
-#define inline
-#endif
 
 /* Different APDU cases */
@@ -777 +772 @@
  * @param card The card object to check
  */
-inline int sc_card_valid(const sc_card_t *card);
+int sc_card_valid(const sc_card_t *card);
 
 /**
@@ -1002 +997 @@
 int sc_card_ctl(sc_card_t *card, unsigned long command, void *arg);
 
-inline int sc_file_valid(const sc_file_t *file);
+int sc_file_valid(const sc_file_t *file);
 sc_file_t * sc_file_new(void);
 void sc_file_free(sc_file_t *file);

trunk/src/libopensc/pkcs15-prkey.c

@@ -205 +205 @@
         case SC_PKCS15_TYPE_PRKEY_DSA:
                 sc_format_asn1_entry(asn1_prkey + 1, &dsa_prkey_obj, NULL, 1);
-                sc_format_asn1_entry(asn1_prk_dsa_attr + 0, asn1_dsakey_value_attr, 0, 1);
+                sc_format_asn1_entry(asn1_prk_dsa_attr + 0, asn1_dsakey_value_attr, NULL, 1);
                 if (prkey->path.type != SC_PATH_TYPE_PATH_PROT) {
                         /* indirect: just add the path */

trunk/src/libopensc/pkcs15-syn.c

@@ -66 +66 @@
         { "atrust-acos",sc_pkcs15emu_atrust_acos_init_ex},
         { "tccardos",   sc_pkcs15emu_tccardos_init_ex   },
-        { NULL, 0 }
+        { NULL, NULL }
 };
 

trunk/src/libopensc/pkcs15.c

@@ -404 +404 @@
 }
 
-struct sc_pkcs15_card * sc_pkcs15_card_new()
+struct sc_pkcs15_card * sc_pkcs15_card_new(void)
 {
         struct sc_pkcs15_card *p15card;

trunk/src/libopensc/reader-openct.c

@@ -160 +160 @@
  * deallocate the private data and any resources.
  */
-int
-openct_reader_finish(sc_context_t *ctx, void *priv_data)
+static int openct_reader_finish(sc_context_t *ctx, void *priv_data)
 {
         SC_FUNC_CALLED(ctx, 1);
@@ -172 +171 @@
  * freed by OpenSC.
  */
-int
-openct_reader_release(sc_reader_t *reader)
+static int openct_reader_release(sc_reader_t *reader)
 {
         struct driver_data *data = (struct driver_data *) reader->drv_data;
@@ -198 +196 @@
  * Check whether a card was added/removed
  */
-int
-openct_reader_detect_card_presence(sc_reader_t *reader,
+static int openct_reader_detect_card_presence(sc_reader_t *reader,
                         sc_slot_info_t *slot)
 {
@@ -272 +269 @@
 }
 
-int
-openct_reader_disconnect(sc_reader_t *reader,
-                        sc_slot_info_t *slot)
+static int openct_reader_disconnect(sc_reader_t *reader, sc_slot_info_t *slot)
 {
         struct driver_data *data = (struct driver_data *) reader->drv_data;
@@ -357 +352 @@
 }
 
-
-int
-openct_reader_perform_verify(sc_reader_t *reader,
-                sc_slot_info_t *slot,
-                struct sc_pin_cmd_data *info)
+static int openct_reader_perform_verify(sc_reader_t *reader,
+                sc_slot_info_t *slot, struct sc_pin_cmd_data *info)
 {
         struct driver_data *data = (struct driver_data *) reader->drv_data;
@@ -420 +412 @@
 }
 
-
-int
-openct_reader_lock(sc_reader_t *reader,
-                        sc_slot_info_t *slot)
+static int openct_reader_lock(sc_reader_t *reader, sc_slot_info_t *slot)
 {
         struct driver_data *data = (struct driver_data *) reader->drv_data;
@@ -448 +437 @@
 }
 
-int
-openct_reader_unlock(sc_reader_t *reader,
-                        sc_slot_info_t *slot)
+static int openct_reader_unlock(sc_reader_t *reader, sc_slot_info_t *slot)
 {
         struct driver_data *data = (struct driver_data *) reader->drv_data;
@@ -474 +461 @@
  * Handle an error code returned by OpenCT
  */
-int
-openct_error(sc_reader_t *reader, int code)
+static int openct_error(sc_reader_t *reader, int code)
 {
         if (code >= 0)

trunk/src/libopensc/sc.c

@@ -35 +35 @@
 
 #ifdef VERSION
-const char *sc_version = VERSION;
+static const char *sc_version = VERSION;
 #else
-const char *sc_version = "(undef)";
+static const char *sc_version = "(undef)";
 #endif
 
@@ -477 +477 @@
 }
 
-sc_file_t * sc_file_new()
+sc_file_t * sc_file_new(void)
 {
         sc_file_t *file = (sc_file_t *)calloc(1, sizeof(sc_file_t));
@@ -633 +633 @@
 }
 
-inline int sc_file_valid(const sc_file_t *file) {
+int sc_file_valid(const sc_file_t *file) {
 #ifndef NDEBUG
         assert(file != NULL);

trunk/src/libopensc/ui.c

@@ -158 +158 @@
  * to the default function
  */
-int
-sc_ui_get_func(sc_context_t *ctx, const char *name, void **ret)
+static int sc_ui_get_func(sc_context_t *ctx, const char *name, void **ret)
 {
         *ret = NULL;
@@ -201 +200 @@
  * Default ui functions
  */
-int
-sc_ui_get_pin_default(sc_ui_hints_t *hints, char **out)
+static int sc_ui_get_pin_default(sc_ui_hints_t *hints, char **out)
 {
         sc_context_t    *ctx = hints->card->ctx;
@@ -234 +232 @@
 }
 
-int
-sc_ui_get_pin_pair_default(sc_ui_hints_t *hints, char **old_out, char **new_out)
+static int sc_ui_get_pin_pair_default(sc_ui_hints_t *hints, char **old_out,
+                                char **new_out)
 {
         sc_context_t    *ctx = hints->card->ctx;
@@ -279 +277 @@
 }
 
-int
-__sc_ui_read_pin(sc_context_t *ctx, const char *prompt,
+static int __sc_ui_read_pin(sc_context_t *ctx, const char *prompt,
                         const char *label, int flags,
                         sc_pkcs15_pin_info_t *pin_info,
@@ -425 +422 @@
 }
 
-int
-sc_ui_display_error_default(sc_context_t *ctx, const char *msg)
+static int sc_ui_display_error_default(sc_context_t *ctx, const char *msg)
 {
         return sc_ui_display_msg(ctx, SC_LOG_TYPE_ERROR, msg);
 }
 
-int
-sc_ui_display_debug_default(sc_context_t *ctx, const char *msg)
+static int sc_ui_display_debug_default(sc_context_t *ctx, const char *msg)
 {
         return sc_ui_display_msg(ctx, SC_LOG_TYPE_DEBUG, msg);

trunk/src/scconf/test-conf.c

@@ -87 +87 @@
 }
 
-int write_entries(scconf_context *conf, scconf_list *list)
+static int write_entries(scconf_context *conf, scconf_list *list)
 {
         static int int42 = 42, int1 = 1;