Browse Source

Merge branch 'symcheck2'

tags/v0.9.3
Michael Brown 17 years ago
parent
commit
e3484e26eb

+ 1
- 1
src/arch/i386/image/eltorito.c View File

298
  * @v image		El Torito file
298
  * @v image		El Torito file
299
  * @ret rc		Return status code
299
  * @ret rc		Return status code
300
  */
300
  */
301
-int eltorito_load ( struct image *image ) {
301
+static int eltorito_load ( struct image *image ) {
302
 	struct eltorito_boot_entry boot_entry;
302
 	struct eltorito_boot_entry boot_entry;
303
 	unsigned long bootcat_offset;
303
 	unsigned long bootcat_offset;
304
 	int rc;
304
 	int rc;

+ 1
- 1
src/arch/i386/image/multiboot.c View File

360
  * @v image		Multiboot file
360
  * @v image		Multiboot file
361
  * @ret rc		Return status code
361
  * @ret rc		Return status code
362
  */
362
  */
363
-int multiboot_load ( struct image *image ) {
363
+static int multiboot_load ( struct image *image ) {
364
 	struct multiboot_header_info hdr;
364
 	struct multiboot_header_info hdr;
365
 	int rc;
365
 	int rc;
366
 
366
 

+ 1
- 1
src/arch/i386/image/nbi.c View File

244
  * @v image		NBI image
244
  * @v image		NBI image
245
  * @ret rc		Return status code
245
  * @ret rc		Return status code
246
  */
246
  */
247
-int nbi_load ( struct image *image ) {
247
+static int nbi_load ( struct image *image ) {
248
 	struct imgheader imgheader;
248
 	struct imgheader imgheader;
249
 	int rc;
249
 	int rc;
250
 
250
 

+ 4
- 0
src/crypto/axtls/aes.c View File

238
     memcpy(ctx->iv, iv, 16);
238
     memcpy(ctx->iv, iv, 16);
239
 }
239
 }
240
 
240
 
241
+#if 0
242
+/** currently unused function **/
243
+
241
 /**
244
 /**
242
  * Change a key for decryption.
245
  * Change a key for decryption.
243
  */
246
  */
256
         *k++ =w;
259
         *k++ =w;
257
     }
260
     }
258
 }
261
 }
262
+#endif
259
 
263
 
260
 /**
264
 /**
261
  * Encrypt a byte sequence (with a block size 16) using the AES cipher.
265
  * Encrypt a byte sequence (with a block size 16) using the AES cipher.

+ 2
- 0
src/crypto/axtls/crypto.h View File

54
 void AES_cbc_encrypt(AES_CTX *ctx, const uint8_t *msg, 
54
 void AES_cbc_encrypt(AES_CTX *ctx, const uint8_t *msg, 
55
         uint8_t *out, int length);
55
         uint8_t *out, int length);
56
 void AES_cbc_decrypt(AES_CTX *ks, const uint8_t *in, uint8_t *out, int length);
56
 void AES_cbc_decrypt(AES_CTX *ks, const uint8_t *in, uint8_t *out, int length);
57
+#if 0 /** currently unused function **/
57
 void AES_convert_key(AES_CTX *ctx);
58
 void AES_convert_key(AES_CTX *ctx);
59
+#endif
58
 
60
 
59
 /**************************************************************************
61
 /**************************************************************************
60
  * RC4 declarations 
62
  * RC4 declarations 

+ 1
- 1
src/crypto/md5.c View File

54
 	return ( c ^ ( b | ~d ) );
54
 	return ( c ^ ( b | ~d ) );
55
 }
55
 }
56
 
56
 
57
-struct md5_step md5_steps[4] = {
57
+static struct md5_step md5_steps[4] = {
58
 	{
58
 	{
59
 		.f = f1,
59
 		.f = f1,
60
 		.coefficient = 1,
60
 		.coefficient = 1,

+ 1
- 1
src/drivers/net/bnx2.c View File

43
 	struct statistics_block stats_blk;
43
 	struct statistics_block stats_blk;
44
 } bnx2_bss;
44
 } bnx2_bss;
45
 
45
 
46
-struct bnx2 bnx2;
46
+static struct bnx2 bnx2;
47
 
47
 
48
 static struct flash_spec flash_table[] =
48
 static struct flash_spec flash_table[] =
49
 {
49
 {

+ 1
- 1
src/drivers/net/ns83820.c View File

364
 #endif
364
 #endif
365
 
365
 
366
 /* Private Storage for the NIC */
366
 /* Private Storage for the NIC */
367
-struct ns83820_private {
367
+static struct ns83820_private {
368
 	u8 *base;
368
 	u8 *base;
369
 	int up;
369
 	int up;
370
 	long idle;
370
 	long idle;

+ 1
- 1
src/drivers/net/pcnet32.c View File

67
 
67
 
68
 /* End Etherboot Specific */
68
 /* End Etherboot Specific */
69
 
69
 
70
-int cards_found /* __initdata */ ;
70
+static int cards_found = 0 /* __initdata */ ;
71
 
71
 
72
 #ifdef REMOVE
72
 #ifdef REMOVE
73
 /* FIXME: Remove these they are probably pointless */
73
 /* FIXME: Remove these they are probably pointless */

+ 2
- 2
src/drivers/net/r8169.c View File

400
 //      20-16   5-bit GMII/MII register address
400
 //      20-16   5-bit GMII/MII register address
401
 //      15-0    16-bit GMII/MII register data
401
 //      15-0    16-bit GMII/MII register data
402
 //=================================================================
402
 //=================================================================
403
-void RTL8169_WRITE_GMII_REG(unsigned long ioaddr, int RegAddr, int value)
403
+static void RTL8169_WRITE_GMII_REG(unsigned long ioaddr, int RegAddr, int value)
404
 {
404
 {
405
 	int i;
405
 	int i;
406
 
406
 
418
 }
418
 }
419
 
419
 
420
 //=================================================================
420
 //=================================================================
421
-int RTL8169_READ_GMII_REG(unsigned long ioaddr, int RegAddr)
421
+static int RTL8169_READ_GMII_REG(unsigned long ioaddr, int RegAddr)
422
 {
422
 {
423
 	int i, value = -1;
423
 	int i, value = -1;
424
 
424
 

+ 2
- 2
src/drivers/net/via-velocity.h View File

1204
 	u32 flags;
1204
 	u32 flags;
1205
 };
1205
 };
1206
 
1206
 
1207
-struct velocity_info_tbl *info;
1207
+static struct velocity_info_tbl *info;
1208
 
1208
 
1209
 #define mac_hw_mibs_init(regs) {\
1209
 #define mac_hw_mibs_init(regs) {\
1210
 	BYTE_REG_BITS_ON(MIBCR_MIBFRZ,&((regs)->MIBCR));\
1210
 	BYTE_REG_BITS_ON(MIBCR_MIBFRZ,&((regs)->MIBCR));\
1768
 #define TX_DESC_MAX     256
1768
 #define TX_DESC_MAX     256
1769
 #define TX_DESC_DEF     TX_DESC_MIN
1769
 #define TX_DESC_DEF     TX_DESC_MIN
1770
 
1770
 
1771
-struct velocity_info {
1771
+static struct velocity_info {
1772
 //      struct list_head list;
1772
 //      struct list_head list;
1773
 
1773
 
1774
 	struct pci_device *pdev;
1774
 	struct pci_device *pdev;

+ 2
- 1
src/hci/commands/image_cmd.c View File

45
  * @v nargs		Argument count
45
  * @v nargs		Argument count
46
  * @v args		Argument list
46
  * @v args		Argument list
47
  */
47
  */
48
-void imgfill_cmdline ( struct image *image, unsigned int nargs, char **args ) {
48
+static void imgfill_cmdline ( struct image *image, unsigned int nargs, 
49
+                              char **args ) {
49
 	size_t used = 0;
50
 	size_t used = 0;
50
 
51
 
51
 	image->cmdline[0] = '\0';
52
 	image->cmdline[0] = '\0';

+ 1
- 12
src/hci/mucurses/kb.c View File

19
 bool m_echo;
19
 bool m_echo;
20
 bool m_cbreak;
20
 bool m_cbreak;
21
 
21
 
22
-/**
23
- * Check KEY_ code supported status
24
- *
25
- * @v kc	keycode value to check
26
- * @ret TRUE	KEY_* supported
27
- * @ret FALSE	KEY_* unsupported
28
- */
29
-int has_key ( int kc __unused ) {
30
-	return TRUE;
31
-}
32
-
33
-int _wgetc ( WINDOW *win ) {
22
+static int _wgetc ( WINDOW *win ) {
34
 	int timer, c;
23
 	int timer, c;
35
 
24
 
36
 	if ( win == NULL )
25
 	if ( win == NULL )

+ 1
- 1
src/hci/mucurses/slk.c View File

50
 	short saved_pair;
50
 	short saved_pair;
51
 };
51
 };
52
 
52
 
53
-struct _softlabelkeys *slks;
53
+static struct _softlabelkeys *slks;
54
 
54
 
55
 /*
55
 /*
56
   I either need to break the primitives here, or write a collection of
56
   I either need to break the primitives here, or write a collection of

+ 4
- 0
src/include/curses.h View File

566
 	return TRUE;
566
 	return TRUE;
567
 }
567
 }
568
 
568
 
569
+static inline int has_key ( int kc __unused ) {
570
+	return TRUE;
571
+}
572
+
569
 static inline int hline ( chtype ch, int n ) {
573
 static inline int hline ( chtype ch, int n ) {
570
 	return whline ( stdscr, ch, n );
574
 	return whline ( stdscr, ch, n );
571
 }
575
 }

+ 3
- 2
src/net/ndp.c View File

65
  * @v ll_addr	Link-layer address
65
  * @v ll_addr	Link-layer address
66
  * @v state	State of the entry - one of the NDP_STATE_XXX values
66
  * @v state	State of the entry - one of the NDP_STATE_XXX values
67
  */
67
  */
68
-void add_ndp_entry ( struct net_device *netdev, struct in6_addr *in6,
69
-		     void *ll_addr, int state ) {
68
+static void 
69
+add_ndp_entry ( struct net_device *netdev, struct in6_addr *in6,
70
+		void *ll_addr, int state ) {
70
 	struct ndp_entry *ndp;
71
 	struct ndp_entry *ndp;
71
 	ndp = &ndp_table[next_new_ndp_entry++ % NUM_NDP_ENTRIES];
72
 	ndp = &ndp_table[next_new_ndp_entry++ % NUM_NDP_ENTRIES];
72
 
73
 

+ 1
- 1
src/net/tcp/http.c View File

465
  * @v uri		Uniform Resource Identifier
465
  * @v uri		Uniform Resource Identifier
466
  * @ret rc		Return status code
466
  * @ret rc		Return status code
467
  */
467
  */
468
-int http_open ( struct xfer_interface *xfer, struct uri *uri ) {
468
+static int http_open ( struct xfer_interface *xfer, struct uri *uri ) {
469
 	struct http_request *http;
469
 	struct http_request *http;
470
 	struct sockaddr_tcpip server;
470
 	struct sockaddr_tcpip server;
471
 	int rc;
471
 	int rc;

+ 1
- 1
src/usr/autoboot.c View File

103
  * @v netdev		Network device
103
  * @v netdev		Network device
104
  * @ret rc		Return status code
104
  * @ret rc		Return status code
105
  */
105
  */
106
-int netboot ( struct net_device *netdev ) {
106
+static int netboot ( struct net_device *netdev ) {
107
 	char buf[256];
107
 	char buf[256];
108
 	int rc;
108
 	int rc;
109
 
109
 

Loading…
Cancel
Save