X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fchassis_id%2Ftable.c;h=ee64ecc774f3b865a295dff61608f6d513577d5d;hb=bf375e3af65f0e9728516a3627613fb95288c1d1;hp=f4689ae24361980af0c7f30d2db4b3939026d8c0;hpb=c5d046b6c7f4dbd2072933b792f95f2793b28178;p=elogind.git

diff --git a/extras/chassis_id/table.c b/extras/chassis_id/table.c
index f4689ae24..ee64ecc77 100644
--- a/extras/chassis_id/table.c
+++ b/extras/chassis_id/table.c
@@ -18,10 +18,13 @@
  * Boston, MA 021110-1307, USA.
  *
  * Authors: Atul Sabharwal
- *          
+ *
  */
 
 #include <stdio.h>
+#include <string.h>
+
+#include "chassis_id.h"
 
 #define TABLE_SIZE 100
 #define PROVISION_DB  "/usr/local/bin/provision.tbl"
@@ -40,7 +43,7 @@ int ptable_size;
 
 /* Initialize the provisioning table by reading the data from special file provision.tbl *
    Return error if something does not work appropriately.                                */
-int table_init()
+int table_init(void)
 {
 	FILE *fp;
 	char ptr[255];
@@ -56,7 +59,7 @@ int table_init()
 	i = 0;
 	while (!feof(fp)) {
 		fgets(ptr, 80, fp);	
-		sscanf(ptr, "%d %d %d %d %d %s %s", &ptable[i].id,
+		sscanf(ptr, "%d %d %d %d %s %s", &ptable[i].id,
 			&ptable[i].num_disks, 
 			&ptable[i].chassis_num, &ptable[i].slot_num,
 			ptable[i].serial_num, ptable[i].name);
@@ -70,7 +73,7 @@ int table_init()
 
 
 /* return -1 when no disk found. Otherwise return index of disk */
-int table_find_disk( char * serialnumber , int * host_num, int * chassis_num, int *slot_num)
+int table_find_disk(const char *serialnumber , int *chassis_num, int *slot_num)
 {
 	int i;
 
@@ -92,10 +95,12 @@ int table_find_disk( char * serialnumber , int * host_num, int * chassis_num, in
  * so that it can create descriptive GDN for it. So, for that we need to output
  * this data to stdout.
  */
-int table_select_disk( int diskindex )
+int table_select_disk(int diskindex)
 {
 	printf("%d ", ptable[diskindex].chassis_num);
 	printf("%d ", ptable[diskindex].slot_num);
 	printf("%s ", ptable[diskindex].name);
+
+	return 0;
 }