From e15d7573a1263fb364d1678c3a46be47a8b5e5ea Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Fri, 2 Jun 2006 20:56:16 +0000 Subject: - move #include busybox.h to the very top so we pull in the config and eventual platform specific includes in early. --- procps/free.c | 17 ++--------------- procps/fuser.c | 3 ++- procps/kill.c | 18 ++---------------- procps/pidof.c | 3 +-- procps/ps.c | 2 +- procps/renice.c | 17 ++--------------- procps/sysctl.c | 4 ++-- procps/top.c | 2 +- procps/uptime.c | 18 ++---------------- 9 files changed, 15 insertions(+), 69 deletions(-) (limited to 'procps') diff --git a/procps/free.c b/procps/free.c index b4163f1..7d8ffa8 100644 --- a/procps/free.c +++ b/procps/free.c @@ -4,28 +4,15 @@ * * Copyright (C) 1999-2004 by Erik Andersen * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. */ /* getopt not needed */ +#include "busybox.h" #include #include #include -#include "busybox.h" int free_main(int argc, char **argv) { diff --git a/procps/fuser.c b/procps/fuser.c index 35d77ed..1a4f612 100644 --- a/procps/fuser.c +++ b/procps/fuser.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * tiny fuser implementation * @@ -7,6 +8,7 @@ * GNU Library General Public License */ +#include "busybox.h" #include #include #include @@ -19,7 +21,6 @@ #include #include #include -#include "busybox.h" #define FUSER_PROC_DIR "/proc" #define FUSER_MAX_LINE 255 diff --git a/procps/kill.c b/procps/kill.c index 90114a4..ca6f420 100644 --- a/procps/kill.c +++ b/procps/kill.c @@ -5,23 +5,10 @@ * Copyright (C) 1995, 1996 by Bruce Perens . * Copyright (C) 1999-2004 by Erik Andersen * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. */ - +#include "busybox.h" #include #include #include @@ -30,7 +17,6 @@ #include #include #include -#include "busybox.h" #define KILL 0 #define KILLALL 1 diff --git a/procps/pidof.c b/procps/pidof.c index 4ad6b15..d9c8dca 100644 --- a/procps/pidof.c +++ b/procps/pidof.c @@ -7,7 +7,7 @@ * Licensed under the GPL v2, see the file LICENSE in this tarball. */ - +#include "busybox.h" #include #include #include @@ -17,7 +17,6 @@ #include #include #include -#include "busybox.h" #if ENABLE_FEATURE_PIDOF_SINGLE #define _SINGLE_COMPL(a) a diff --git a/procps/ps.c b/procps/ps.c index b6242d2..9dc6839 100644 --- a/procps/ps.c +++ b/procps/ps.c @@ -7,6 +7,7 @@ * Licensed under the GPL v2, see the file LICENSE in this tarball. */ +#include "busybox.h" #include #include #include @@ -17,7 +18,6 @@ #include #include #include -#include "busybox.h" #if ENABLE_SELINUX #include /* for is_selinux_enabled() */ #endif diff --git a/procps/renice.c b/procps/renice.c index 711ed16..53dc578 100644 --- a/procps/renice.c +++ b/procps/renice.c @@ -4,20 +4,7 @@ * * Copyright (C) 2005 Manuel Novoa III * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. */ /* Notes: @@ -32,6 +19,7 @@ * following IDs (if any). Multiple switches are allowed. */ +#include "busybox.h" #include #include #include @@ -39,7 +27,6 @@ #include #include #include -#include "busybox.h" #if (PRIO_PROCESS < CHAR_MIN) || (PRIO_PROCESS > CHAR_MAX) #error Assumption violated : PRIO_PROCESS value diff --git a/procps/sysctl.c b/procps/sysctl.c index 125f132..5673d29 100644 --- a/procps/sysctl.c +++ b/procps/sysctl.c @@ -1,4 +1,4 @@ - +/* vi: set sw=4 ts=4: */ /* * Sysctl 1.01 - A utility to read and manipulate the sysctl parameters * @@ -14,6 +14,7 @@ * */ +#include "busybox.h" #include #include #include @@ -23,7 +24,6 @@ #include #include #include -#include "busybox.h" /* * Function Prototypes diff --git a/procps/top.c b/procps/top.c index c0d16b6..a97e557 100644 --- a/procps/top.c +++ b/procps/top.c @@ -28,13 +28,13 @@ * GNU Library General Public License */ +#include "busybox.h" #include #include #include #include #include #include -#include "busybox.h" //#define CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE /* + 2k */ diff --git a/procps/uptime.c b/procps/uptime.c index 7784850..c1e7af3 100644 --- a/procps/uptime.c +++ b/procps/uptime.c @@ -4,20 +4,7 @@ * * Copyright (C) 1999-2004 by Erik Andersen * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. */ /* This version of uptime doesn't display the number of users on the system, @@ -28,12 +15,11 @@ /* getopt not needed */ - +#include "busybox.h" #include #include #include #include -#include "busybox.h" #ifndef FSHIFT # define FSHIFT 16 /* nr of bits of precision */ -- cgit v1.1