Changeset 951

Timestamp:

05/25/07 12:02:04 (5 years ago)

Author:

aj

Message:

and more static definitions.

Location:

trunk/src

Files:

• ifd/ifd-acr30u.c (modified) (2 diffs)
• ifd/ifd-ccid.c (modified) (1 diff)
• ifd/ifd-wbeiuu.c (modified) (2 diffs)
• ifd/ifdhandler.c (modified) (9 diffs)
• ifd/ifdproxy.c (modified) (5 diffs)
• ifd/ria-device.c (modified) (3 diffs)
• ifd/ria-server.c (modified) (10 diffs)
• tools/openct-control.c (modified) (7 diffs)
• tools/openct-tool.c (modified) (9 diffs)

trunk/src/ifd/ifd-acr30u.c

@@ -520 +520 @@
 }
 
+#if 0
 /*
  * Set the card's baud rate etc
@@ -527 +528 @@
         return 0;
 }
+#endif
 
 /*

trunk/src/ifd/ifd-ccid.c

@@ -1127 +1127 @@
         if (st->sbuf[dad]) {
                 free(st->sbuf[dad]);
-                st->sbuf[dad] = 0;
-                st->slen[dad] = 0;
+                st->sbuf[dad] = NULL;
+                st->slen[dad] = NULL;
         }
 

trunk/src/ifd/ifd-wbeiuu.c

@@ -564 +564 @@
 }
 
+#if 0
 static int wbeiuu_card_status(ifd_reader_t * reader, int slot, int *status)
 {
@@ -602 +603 @@
         return 0;
 }
+#endif
 
 static int wbeiuu_send(ifd_reader_t * reader, unsigned int dad,

trunk/src/ifd/ifdhandler.c

@@ -1 @@
-/*
+/i*
  * Manage a single reader
  *
@@ -190 +190 @@
  * Spawn a new ifd handler thread
  */
-void ifdhandler_run(ifd_reader_t * reader)
+static void ifdhandler_run(ifd_reader_t * reader)
 {
         ct_socket_t *sock;
@@ -245 +245 @@
  * Poll for presence of hotplug device
  */
-int ifdhandler_poll_presence(ct_socket_t * sock, struct pollfd *pfd)
+static int ifdhandler_poll_presence(ct_socket_t * sock, struct pollfd *pfd)
 {
         ifd_reader_t *reader = (ifd_reader_t *) sock->user_data;
@@ -321 +321 @@
  * Receive data from client
  */
-int ifdhandler_recv(ct_socket_t * sock)
+static int ifdhandler_recv(ct_socket_t * sock)
 {
         ifd_reader_t *reader;
@@ -359 +359 @@
  * Transmit data to client
  */
-int ifdhandler_send(ct_socket_t * sock)
+static int ifdhandler_send(ct_socket_t * sock)
 {
         return ct_socket_flsbuf(sock, 0);
@@ -368 +368 @@
  * Release any locks held by this client
  */
-void ifdhandler_close(ct_socket_t * sock)
+static void ifdhandler_close(ct_socket_t * sock)
 {
         ifdhandler_unlock_all(sock);
@@ -401 +401 @@
 }
 
-void print_info(void)
+static void print_info(void)
 {
         const char *names[64];
@@ -426 +426 @@
  * Display version
  */
-void version(void)
+static void version(void)
 {
         fprintf(stdout, "OpenCT " VERSION "\n");
@@ -435 +435 @@
  * Usage message
  */
-void usage(int exval)
+static void usage(int exval)
 {
         fprintf(exval ? stderr : stdout,

trunk/src/ifd/ifdproxy.c

@@ -172 +172 @@
 }
 
-int run_server(int argc, char **argv)
+static int run_server(int argc, char **argv)
 {
         int rc;
@@ -206 +206 @@
 }
 
-int run_client(int argc, char **argv)
+static int run_client(int argc, char **argv)
 {
         const char *name, *device, *address;
@@ -238 +238 @@
 }
 
-int list_devices(int argc, char **argv)
+static int list_devices(int argc, char **argv)
 {
         unsigned char buffer[8192];
@@ -279 +279 @@
 }
 
-void version()
+static void version(void)
 {
         fprintf(stderr, "OpenCT " VERSION "\n");
@@ -285 +285 @@
 }
 
-void usage(int exval)
+static void usage(int exval)
 {
         fprintf(exval ? stderr : stdout,

trunk/src/ifd/ria-device.c

@@ -95 +95 @@
 }
 
-int ria_devsock_process(ct_socket_t * sock, header_t * hdr, ct_buf_t * args,
-                        ct_buf_t * resp)
+static int ria_devsock_process(ct_socket_t * sock, header_t * hdr,
+                        ct_buf_t * args, ct_buf_t * resp)
 {
         ria_client_t *ria = (ria_client_t *) sock->user_data;
@@ -185 +185 @@
 }
 
-void ria_devsock_close(ct_socket_t * sock)
+static void ria_devsock_close(ct_socket_t * sock)
 {
         ct_error("Network connection closed, exiting\n");
@@ -237 +237 @@
 }
 
-void ria_close_device(ct_socket_t * sock)
+static void ria_close_device(ct_socket_t * sock)
 {
         ct_error("Dispatcher requests that device is closed, abort");

trunk/src/ifd/ria-server.c

@@ -79 +79 @@
 }
 
-int ria_svc_accept(ct_socket_t * listener)
+static int ria_svc_accept(ct_socket_t * listener)
 {
         ria_peer_t *clnt;
@@ -104 +104 @@
 }
 
-void ria_svc_app_close(ct_socket_t * sock)
+static void ria_svc_app_close(ct_socket_t * sock)
 {
         ria_peer_t *clnt = (ria_peer_t *) sock->user_data;
@@ -113 +113 @@
 }
 
-void ria_svc_dev_close(ct_socket_t * sock)
+static void ria_svc_dev_close(ct_socket_t * sock)
 {
         ria_peer_t *clnt = (ria_peer_t *) sock->user_data;
@@ -125 +125 @@
  * to claim a device).
  */
-int ria_svc_app_handler(ct_socket_t * sock, header_t * hdr, ct_buf_t * args,
-                        ct_buf_t * resp)
+static int ria_svc_app_handler(ct_socket_t * sock, header_t * hdr,
+                        ct_buf_t * args, ct_buf_t * resp)
 {
         unsigned char cmd;
@@ -196 +196 @@
  * Process commands from remote clients (i.e. those offering a device).
  */
-int ria_svc_dev_handler(ct_socket_t * sock, header_t * hdr, ct_buf_t * args,
-                        ct_buf_t * resp)
+static int ria_svc_dev_handler(ct_socket_t * sock, header_t * hdr,
+                        ct_buf_t * args, ct_buf_t * resp)
 {
         unsigned char cmd;
@@ -255 +255 @@
 }
 
-ria_peer_t *ria_peer_new(ct_socket_t * sock)
+static ria_peer_t *ria_peer_new(ct_socket_t * sock)
 {
         ria_peer_t *clnt;
@@ -270 +270 @@
 }
 
-void ria_peer_free(ria_peer_t * clnt, int detach_peer)
+static void ria_peer_free(ria_peer_t * clnt, int detach_peer)
 {
         ria_peer_t *peer;
@@ -287 +287 @@
 }
 
-void ria_svc_link(ria_peer_t * clnt)
+static void ria_svc_link(ria_peer_t * clnt)
 {
         ria_peer_t *prev;
@@ -298 +298 @@
 }
 
-ria_peer_t *ria_find_device(const char *handle, size_t len)
+static ria_peer_t *ria_find_device(const char *handle, size_t len)
 {
         ria_peer_t *peer;
@@ -320 +320 @@
 }
 
-void ria_svc_unlink(ria_peer_t * clnt)
+static void ria_svc_unlink(ria_peer_t * clnt)
 {
         ria_peer_t *prev, *next;

trunk/src/tools/openct-control.c

@@ -92 +92 @@
 }
 
-int mgr_init(int argc, char **argv)
+static int mgr_init(int argc, char **argv)
 {
         int n;
@@ -132 +132 @@
  * shut down the whole thing
  */
-int mgr_shutdown(int argc, char **argv)
+static int mgr_shutdown(int argc, char **argv)
 {
         const ct_info_t *status;
@@ -159 +159 @@
  * Attach a new reader
  */
-int mgr_attach(int argc, char **argv)
+static int mgr_attach(int argc, char **argv)
 {
         const char *driver, *type, *device;
@@ -203 +203 @@
  * Show status of all readers
  */
-int mgr_status(int argc, char **argv)
+static int mgr_status(int argc, char **argv)
 {
         const ct_info_t *readers, *r;
@@ -255 +255 @@
  * Configure a reader using info from the config file
  */
-void configure_reader(ifd_conf_node_t * cf)
+static void configure_reader(ifd_conf_node_t * cf)
 {
         static unsigned int nreaders = 0;
@@ -282 +282 @@
  * Display version
  */
-void version(void)
+static void version(void)
 {
         fprintf(stdout, "OpenCT " VERSION "\n");
@@ -291 +291 @@
  * Usage message
  */
-void usage(int exval)
+static void usage(int exval)
 {
         fprintf(exval ? stderr : stdout,

trunk/src/tools/openct-tool.c

@@ -185 +185 @@
 }
 
-void version(void)
+static void version(void)
 {
         fprintf(stdout, "OpenCT " VERSION "\n");
@@ -191 +191 @@
 }
 
-void usage(int exval)
+static void usage(int exval)
 {
         fprintf(exval ? stderr : stdout,
@@ -212 +212 @@
 }
 
-int do_reset(ct_handle * h, unsigned char *atr, size_t atr_len)
+static int do_reset(ct_handle * h, unsigned char *atr, size_t atr_len)
 {
         int rc, n, status;
@@ -240 +240 @@
 }
 
-void do_select_mf(ct_handle * h)
+static void do_select_mf(ct_handle * h)
 {
         unsigned char cmd[] =
@@ -272 +272 @@
 }
 
-void do_read_memory(ct_handle * h, unsigned int address, unsigned int count)
+static void do_read_memory(ct_handle * h, unsigned int address, unsigned int count)
 {
         unsigned char buffer[8192];
@@ -291 +291 @@
 }
 
-void print_reader(ct_handle * h)
+static void print_reader(ct_handle * h)
 {
         ct_info_t info;
@@ -303 +303 @@
 }
 
-void print_reader_info(ct_info_t * info)
+static void print_reader_info(ct_info_t * info)
 {
         const char *sepa;
@@ -327 +327 @@
 }
 
-void print_atr(ct_handle * h, unsigned char *atr, size_t len)
+static void print_atr(ct_handle * h, unsigned char *atr, size_t len)
 {
         unsigned int m;
@@ -341 +341 @@
 }
 
-void dump(unsigned char *data, size_t len)
+static void dump(unsigned char *data, size_t len)
 {
         unsigned int offset = 0;