picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[PATCH] clean up chassis_id coding style.

Browse source
This commit is contained in:
greg@kroah.com 2004-03-31 18:27:02 -08:00 committed by Greg KH
parent fa5acd760d
commit 0bcdc8498c
3 changed files with 158 additions and 174 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
extras/chassis_id/chassis_id.c
View file

@ -1,17 +1,14 @@
/* -*-c-*-:
/* -*-c-*-:
**
** (C) 2003 Intel Corporation
** Atul Sabharwal <atul.sabharwal@intel.com>
**
** $Id: chassis_id.c,v 1.8 2004/03/22 23:33:10 atul Exp $
**
** Distributed under the terms of the GNU Public License, v2.0 or
** later.
**
** Many parts heavily based on test-skeleton.c, by Ulrich Drepper;
** with his permission, they have been re-licensed GPL, and his
** copyright still applies on them.
** copyright still applies on them
**
*/
@ -27,14 +24,14 @@ int main(int argc, char **argv, char ** envp)
{
int chassis_num, slot_num, retval, host_num;
char disk_snum[255], devpath[255];
char * ptr;
char *ptr;
int disk_index;
syslog( LOG_PID| LOG_DAEMON| LOG_ERR, "\n%s", "starting chassis_id" );
#if 0
ptr = (char *) getenv( "CHASSIS");
if( ptr == NULL )
ptr = getenv("CHASSIS");
if (ptr == NULL)
return -ERROR_NO_CHASSIS;
sscanf(ptr, "%d", &chassis_num);
@ -43,8 +40,8 @@ int main(int argc, char **argv, char ** envp)
#endif
ptr = (char *) getenv( "SLOT" );
if( ptr== NULL )
ptr = getenv("SLOT");
if (ptr== NULL)
return -ERROR_NO_SLOT;
sscanf(ptr, "%d", &slot_num);
@ -52,31 +49,27 @@ int main(int argc, char **argv, char ** envp)
syslog( LOG_PID|LOG_DAEMON| LOG_ERR, "Slot %d", slot_num);
#endif
#endif
ptr = (char *) getenv( "DEVPATH");
if( ptr == NULL )
ptr = getenv("DEVPATH");
if (ptr == NULL)
return -ERROR_NO_DEVPATH;
sscanf(ptr, "%s", &devpath[0]);
#ifdef DEBUG
syslog( LOG_PID|LOG_DAEMON| LOG_ERR, "Devpath %s", devpath);
syslog(LOG_PID|LOG_DAEMON| LOG_ERR, "Devpath %s", devpath);
#endif
retval = table_init();
if(retval < 0 )
if (retval < 0)
return -ERROR_BAD_TABLE;
getserial_number( devpath, disk_snum);
getserial_number(devpath, disk_snum);
/* Now we open the provisioning table t find actual entry for the serial number*/
disk_index = table_find_disk(disk_snum, &host_num, &chassis_num, &slot_num);
if ( disk_index == -1 )
{
//typical provisioning error
if ( disk_index == -1 ) {
// typical provisioning error
return -ERROR_NO_DISK;
}
else
{
} else {
table_select_disk( disk_index );
}
return 0;
@ -87,19 +80,19 @@ int main(int argc, char **argv, char ** envp)
int getserial_number( char * devpath, char * snumber )
{
FILE *fp;
char vendor [255], model[255], cmd[255];
char vendor[255], model[255], cmd[255];
int retval;
sprintf(cmd, "/sbin/scsi_id -s %s -p 0x80", devpath);
fp = popen( cmd, "r");
fp = popen(cmd, "r");
if (fp == NULL)
return -ERROR_BAD_SNUMBER;
fscanf( fp, "%s %s %s", vendor, model, snumber);
fscanf(fp, "%s %s %s", vendor, model, snumber);
#ifdef DEBUG
syslog( LOG_PID| LOG_DAEMON| LOG_ERR, "\n%s", snumber );
syslog(LOG_PID| LOG_DAEMON| LOG_ERR, "\n%s", snumber );
#endif
retval = pclose(fp);
@ -107,6 +100,5 @@ int getserial_number( char * devpath, char * snumber )
return -ERROR_BAD_SNUMBER;
else
return NO_ERROR;
}

5
extras/chassis_id/chassis_id.h
View file

@ -1,11 +1,8 @@
/* -*-c-*-:
/* -*-c-*-:
**
** (C) 2003 Intel Corporation
** Atul Sabharwal <atul.sabharwal@intel.com>
**
** $Id: chassis_id.h,v 1.1 2004/03/16 18:24:44 atul Exp $
**
** Distributed under the terms of the GNU Public License, v2.0 or
** later.
**

37
extras/chassis_id/table.c
View file

@ -1,4 +1,4 @@
/* -*-c-*-:
/* -*-c-*-:
**
** (C) 2003 Intel Corporation
** Atul Sabharwal <atul.sabharwal@intel.com>
@ -15,6 +15,7 @@
*/
#include <stdio.h>
#define TABLE_SIZE 100
#define PROVISION_DB "/usr/local/bin/provision.tbl"
@ -27,7 +28,6 @@ struct provision_record
int slot_num;
char serial_num[32];
char name[32];
} ptable[TABLE_SIZE];
int ptable_size;
@ -40,20 +40,20 @@ int table_init()
char ptr[255];
int i;
fp=fopen( PROVISION_DB, "r");
fp = fopen( PROVISION_DB, "r");
if ((fp== NULL) || feof(fp))
return -1;
//skip the first line of text which contains descriptive details.
// skip the first line of text which contains descriptive details.
fgets(ptr, 80, fp);
i = 0;
while (!feof(fp))
{
while (!feof(fp)) {
fgets(ptr, 80, fp);
sscanf( ptr, "%d %d %d %d %d %s %s", &ptable[i].id, &ptable[i].host_num,
&ptable[i].num_disks, &ptable[i].chassis_num, &ptable[i].slot_num,
ptable[i].serial_num, ptable[i].name );
sscanf(ptr, "%d %d %d %d %d %s %s", &ptable[i].id,
&ptable[i].host_num, &ptable[i].num_disks,
&ptable[i].chassis_num, &ptable[i].slot_num,
ptable[i].serial_num, ptable[i].name);
i++;
}
@ -66,15 +66,10 @@ 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 i;
for(i = 0; i < ptable_size; i++)
{
if(strcmp(ptable[i].serial_num, serialnumber) == 0)
{
for (i = 0; i < ptable_size; i++) {
if (strcmp(ptable[i].serial_num, serialnumber) == 0) {
*host_num = ptable[i].host_num;
*chassis_num = ptable[i].chassis_num;
*slot_num = ptable[i].slot_num;
@ -82,21 +77,21 @@ int table_find_disk( char * serialnumber , int * host_num, int * chassis_num, in
}
}
if(i == ptable_size)
if (i == ptable_size)
return -1;
else
return i;
}
/* This function is primarily there for passing the selected disk entry to udev so that *
* it can create descriptive GDN for it. So, for that we need to output this data to *
* stdout. */
/* This function is primarily there for passing the selected disk entry to udev
* 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 )
{
printf("%d ", ptable[diskindex].chassis_num);
printf("%d ", ptable[diskindex].slot_num);
printf("%d ", ptable[diskindex].host_num);
printf("%s ", ptable[diskindex].name);
}