File scsirastools-1.5.8-glibc210.diff of Package scsirastools

Overview Repositories Revisions Requests Users Attributes Meta

File scsirastools-1.5.8-glibc210.diff of Package scsirastools

Index: scsirastools-1.5.8/src/getmd.c
===================================================================
--- scsirastools-1.5.8.orig/src/getmd.c
+++ scsirastools-1.5.8/src/getmd.c
@@ -81,7 +81,7 @@ static int findmatch(const char *buffer,
     } else return (-1);  /*not found*/
 }
 
-static int getline(FILE * fd, char *buf, int len)
+static int mygetline(FILE * fd, char *buf, int len)
 {
     int i;
     int ch;
@@ -119,7 +119,7 @@ int getmd(char *devpattn, int sdevpattn,
     sraidstr = strlen(raidstr);
     strcpy(mdpart, "/dev/sda1");	/* default */
     strcpy(rdev, "/dev/md0");	/* default */
-    while ((rlen = getline(fd, buf, 80)) > 0) {	/* process each line */
+    while ((rlen = mygetline(fd, buf, 80)) > 0) {	/* process each line */
 	buf[rlen] = 0;		/* stringify */
 	/* look for raiddev string */
 	i = findmatch(buf, rlen, raidstr, sraidstr, 0);
Index: scsirastools-1.5.8/src/sgsubmon.c
===================================================================
--- scsirastools-1.5.8.orig/src/sgsubmon.c
+++ scsirastools-1.5.8/src/sgsubmon.c
@@ -186,7 +186,7 @@ void dump_log(uchar * pbuf, int sz, char
     dump_buf(fd, pbuf,sz,tag,fshowascii);
 }
 
-int getline(FILE * fd, char *buf, int len)
+int mygetline(FILE * fd, char *buf, int len)
 {
     int i;
     int ch;
Index: scsirastools-1.5.8/src/sgsubmon.h
===================================================================
--- scsirastools-1.5.8.orig/src/sgsubmon.h
+++ scsirastools-1.5.8/src/sgsubmon.h
@@ -125,7 +125,7 @@ void itoh(uchar * chp, int len, char *st
 void dumpbufr(FILE * fdout, uchar * bufp, int mlen, char *hdr);
 void dump_buf(FILE * fdout, uchar * bufp, int mlen, char *hdr, char fascii);
 void dump_log(uchar * bufp, int mlen, char *hdr, char fascii);
-int  getline(FILE * fd, char *buf, int len) ;
+int  mygetline(FILE * fd, char *buf, int len) ;
 int  findmatch(char *buffer,int sbuf, char *pattern,int spattern,char figncase);
 int  fillstr(char *to, uchar *from,int len);
 int  IsSATA(int idev);
Index: scsirastools-1.5.8/src/sgraidmon.c
===================================================================
--- scsirastools-1.5.8.orig/src/sgraidmon.c
+++ scsirastools-1.5.8/src/sgraidmon.c
@@ -330,7 +330,7 @@ getmd(char *devname, char *mddev, char *
     rdev[0] = 0;	/* default rdev (mddev) */
     strcpy(mdpart, "/dev/sdz1");	/* default mdpart */
     foundit = 0;
-    while ((rlen = getline(fd, buf, 80)) > 0) {	/* process each line */
+    while ((rlen = mygetline(fd, buf, 80)) > 0) {	/* process each line */
 	buf[rlen] = 0;		/* stringify */
 	/* check for comment */
 	if (buf[0] == '#') continue;
@@ -392,7 +392,7 @@ int getnpart(void)
    if (fd == NULL) return (np);
    sraidstr = strlen(raidstr);
    sdevstr = strlen(devstr);
-   while ((rlen = getline(fd, buf, 80)) > 0) {	/* process each line */
+   while ((rlen = mygetline(fd, buf, 80)) > 0) {	/* process each line */
 	buf[rlen] = 0;		/* stringify */
 	/* check for comment */
 	if (buf[0] == '#') continue;
Index: scsirastools-1.5.8/src/sgsafte.c
===================================================================
--- scsirastools-1.5.8.orig/src/sgsafte.c
+++ scsirastools-1.5.8/src/sgsafte.c
@@ -231,7 +231,7 @@ getmd(char *devname, char *mddev, char *
     rdev[0] = 0;	/* default rdev (mddev) */
     strcpy(mdpart, "/dev/sdz1");	/* default mdpart */
     foundit = 0;
-    while ((rlen = getline(fd, buf, 80)) > 0) {	/* process each line */
+    while ((rlen = mygetline(fd, buf, 80)) > 0) {	/* process each line */
 	buf[rlen] = 0;		/* stringify */
 	/* look for raiddev string */
 	i = findmatch(buf, rlen, raidstr, sraidstr, 0);
@@ -284,7 +284,7 @@ int getnpart(void)
    fd = fopen(raidfile, "r");
    if (fd == NULL) return (np);
    sraidstr = strlen(raidstr);
-   while ((rlen = getline(fd, buf, 80)) > 0) {	/* process each line */
+   while ((rlen = mygetline(fd, buf, 80)) > 0) {	/* process each line */
 	buf[rlen] = 0;		/* stringify */
 	/* look for raiddev string */
 	i = findmatch(buf, rlen, raidstr, sraidstr, 0);

Places

File scsirastools-1.5.8-glibc210.diff of Package scsirastools

Places