Re: [PATCH] Delete util/putchar.{c,h} and util/puts.c

[Samuel Thibault]

Applied, thanks!

Flavio Cruz, le mar. 17 janv. 2023 00:09:45 -0500, a ecrit:
> Those functions are unused.
> ---
>  Makefrag.am    |  3 ---
>  util/putchar.c | 32 --------------------------------
>  util/putchar.h | 32 --------------------------------
>  util/puts.c    | 40 ----------------------------------------
>  4 files changed, 107 deletions(-)
>  delete mode 100644 util/putchar.c
>  delete mode 100644 util/putchar.h
>  delete mode 100644 util/puts.c
> 
> diff --git a/Makefrag.am b/Makefrag.am
> index 9da44d55..60aeffe0 100644
> --- a/Makefrag.am
> +++ b/Makefrag.am
> @@ -240,9 +240,6 @@ EXTRA_DIST += \
>  #
>  
>  libkernel_a_SOURCES += \
> -     util/putchar.c \
> -     util/putchar.h \
> -     util/puts.c \
>       util/atoi.c \
>       util/atoi.h \
>       util/byteorder.h \
> diff --git a/util/putchar.c b/util/putchar.c
> deleted file mode 100644
> index 76c013ed..00000000
> --- a/util/putchar.c
> +++ /dev/null
> @@ -1,32 +0,0 @@
> -/* 
> - * Copyright (c) 1995 The University of Utah and
> - * the Computer Systems Laboratory at the University of Utah (CSL).
> - * All rights reserved.
> - *
> - * Permission to use, copy, modify and distribute this software is hereby
> - * granted provided that (1) source code retains these copyright, permission,
> - * and disclaimer notices, and (2) redistributions including binaries
> - * reproduce the notices in supporting documentation, and (3) all advertising
> - * materials mentioning features or use of this software display the 
> following
> - * acknowledgement: ``This product includes software developed by the
> - * Computer Systems Laboratory at the University of Utah.''
> - *
> - * THE UNIVERSITY OF UTAH AND CSL ALLOW FREE USE OF THIS SOFTWARE IN ITS "AS
> - * IS" CONDITION.  THE UNIVERSITY OF UTAH AND CSL DISCLAIM ANY LIABILITY OF
> - * ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS 
> SOFTWARE.
> - *
> - * CSL requests users of this software to return to csl-dist@cs.utah.edu any
> - * improvements that they make and grant CSL redistribution rights.
> - *
> - *      Author: Bryan Ford, University of Utah CSL
> - */
> -
> -#include <device/cons.h>
> -#include <util/putchar.h>
> -
> -int putchar(int c)
> -{
> -     cnputc(c);
> -     return c;
> -}
> -
> diff --git a/util/putchar.h b/util/putchar.h
> deleted file mode 100644
> index 2e65bd56..00000000
> --- a/util/putchar.h
> +++ /dev/null
> @@ -1,32 +0,0 @@
> -/*
> - * Copyright (C) 2008 Free Software Foundation, Inc.
> - *
> - * 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, 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, 675 Mass Ave, Cambridge, MA 02139, USA.
> - *
> - *  Author: Barry deFreese.
> - */
> -/*
> - *     Simple putchar implementation header.
> - *
> - */
> -
> -#ifndef _PUTCHAR_H_
> -#define _PUTCHAR_H_
> -
> -#include <mach/std_types.h>
> -
> -extern int putchar(int c);
> -
> -#endif /* _PUTCHAR_H_ */
> diff --git a/util/puts.c b/util/puts.c
> deleted file mode 100644
> index 0bd72e98..00000000
> --- a/util/puts.c
> +++ /dev/null
> @@ -1,40 +0,0 @@
> -/* 
> - * Copyright (c) 1995 The University of Utah and
> - * the Computer Systems Laboratory at the University of Utah (CSL).
> - * All rights reserved.
> - *
> - * Permission to use, copy, modify and distribute this software is hereby
> - * granted provided that (1) source code retains these copyright, permission,
> - * and disclaimer notices, and (2) redistributions including binaries
> - * reproduce the notices in supporting documentation, and (3) all advertising
> - * materials mentioning features or use of this software display the 
> following
> - * acknowledgement: ``This product includes software developed by the
> - * Computer Systems Laboratory at the University of Utah.''
> - *
> - * THE UNIVERSITY OF UTAH AND CSL ALLOW FREE USE OF THIS SOFTWARE IN ITS "AS
> - * IS" CONDITION.  THE UNIVERSITY OF UTAH AND CSL DISCLAIM ANY LIABILITY OF
> - * ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS 
> SOFTWARE.
> - *
> - * CSL requests users of this software to return to csl-dist@cs.utah.edu any
> - * improvements that they make and grant CSL redistribution rights.
> - *
> - *      Author: Bryan Ford, University of Utah CSL
> - */
> -
> -#include <device/cons.h>
> -#include <util/putchar.h>
> -
> -/* Simple puts() implementation that just uses putchar().
> -   Note that our libc's printf() is implemented
> -   in terms of only puts() and putchar(), so that's all we need.  */
> -int puts(const char *s)
> -{
> -     while (*s)
> -     {
> -             putchar(*s);
> -             s++;
> -     }
> -     putchar('\n');
> -     return 0;
> -}
> -
> -- 
> 2.39.0
> 
> 

-- 
Samuel
---
Pour une évaluation indépendante, transparente et rigoureuse !
Je soutiens la Commission d'Évaluation de l'Inria.