Patchs from Jeff Garzik <jgarzik@mandrakesoft.com> to cleanup
warnings with glibc 2.2 and use always use xfopen -Erik
This commit is contained in:
@@ -198,8 +198,7 @@ static int readmode(struct fb_var_screeninfo *base, const char *fn,
|
||||
char buf[256];
|
||||
char *p = buf;
|
||||
|
||||
if ((f = fopen(fn, "r")) == NULL)
|
||||
perror_msg_and_die("readmode(fopen)");
|
||||
f = xfopen(fn, "r");
|
||||
while (!feof(f)) {
|
||||
fgets(buf, sizeof(buf), f);
|
||||
if ((p = strstr(buf, "mode ")) || (p = strstr(buf, "mode\t"))) {
|
||||
|
||||
@@ -683,10 +683,7 @@ char *filename;
|
||||
FILE *listfile;
|
||||
unsigned long blockno;
|
||||
|
||||
listfile = fopen(filename, "r");
|
||||
if (listfile == (FILE *) NULL) {
|
||||
error_msg_and_die("can't open file of bad blocks");
|
||||
}
|
||||
listfile = xfopen(filename, "r");
|
||||
while (!feof(listfile)) {
|
||||
fscanf(listfile, "%ld\n", &blockno);
|
||||
mark_zone(blockno);
|
||||
|
||||
@@ -28,6 +28,8 @@
|
||||
#include <netdb.h>
|
||||
#include <stdio.h>
|
||||
#include <getopt.h>
|
||||
#include <string.h>
|
||||
#include <time.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include "busybox.h"
|
||||
|
||||
@@ -26,6 +26,7 @@
|
||||
#include <mntent.h>
|
||||
#include <dirent.h>
|
||||
#include <errno.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <sys/mount.h>
|
||||
#include <sys/syscall.h>
|
||||
|
||||
Reference in New Issue
Block a user