alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-02-09 00:00:04 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Delete more shim layer code

Browse Source
This commit is contained in:
Kent Overstreet 2018-06-01 16:20:02 -04:00
parent bb6f4111fb
commit f2f3de4da4
3 changed files with 11 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
linux/kstrtox.c
View File

@ -19,6 +19,8 @@
#include <linux/types.h> #include <linux/types.h>
#include "kstrtox.h" #include "kstrtox.h"
#define KSTRTOX_OVERFLOW (1U << 31)
const char *_parse_integer_fixup_radix(const char *s, unsigned int *base) const char *_parse_integer_fixup_radix(const char *s, unsigned int *base)
{ {
if (*base == 0) { if (*base == 0) {

1
linux/kstrtox.h
View File

@ -1,7 +1,6 @@
#ifndef _LIB_KSTRTOX_H #ifndef _LIB_KSTRTOX_H
#define _LIB_KSTRTOX_H #define _LIB_KSTRTOX_H
#define KSTRTOX_OVERFLOW (1U << 31)
const char *_parse_integer_fixup_radix(const char *s, unsigned int *base); const char *_parse_integer_fixup_radix(const char *s, unsigned int *base);
unsigned int _parse_integer(const char *s, unsigned int base, unsigned long long *res); unsigned int _parse_integer(const char *s, unsigned int base, unsigned long long *res);

72
linux/vsprintf.c
View File

@ -1,75 +1,21 @@
#include <linux/kernel.h> #include <stdlib.h>
#include "kstrtox.h"
/**
* simple_strtoull - convert a string to an unsigned long long
* @cp: The start of the string
* @endp: A pointer to the end of the parsed string will be placed here
* @base: The number base to use
*
* This function is obsolete. Please use kstrtoull instead.
*/
unsigned long long simple_strtoull(const char *cp, char **endp, unsigned int base) unsigned long long simple_strtoull(const char *cp, char **endp, unsigned int base)
{ {
unsigned long long result; return strtoull(cp, endp, base);
unsigned int rv;
cp = _parse_integer_fixup_radix(cp, &base);
rv = _parse_integer(cp, base, &result);
/* FIXME */
cp += (rv & ~KSTRTOX_OVERFLOW);
if (endp)
*endp = (char *)cp;
return result;
} }
EXPORT_SYMBOL(simple_strtoull);
/**
* simple_strtoul - convert a string to an unsigned long
* @cp: The start of the string
* @endp: A pointer to the end of the parsed string will be placed here
* @base: The number base to use
*
* This function is obsolete. Please use kstrtoul instead.
*/
unsigned long simple_strtoul(const char *cp, char **endp, unsigned int base) unsigned long simple_strtoul(const char *cp, char **endp, unsigned int base)
{ {
return simple_strtoull(cp, endp, base); return strtoul(cp, endp, base);
} }
EXPORT_SYMBOL(simple_strtoul);
/**
* simple_strtol - convert a string to a signed long
* @cp: The start of the string
* @endp: A pointer to the end of the parsed string will be placed here
* @base: The number base to use
*
* This function is obsolete. Please use kstrtol instead.
*/
long simple_strtol(const char *cp, char **endp, unsigned int base)
{
if (*cp == '-')
return -simple_strtoul(cp + 1, endp, base);
return simple_strtoul(cp, endp, base);
}
EXPORT_SYMBOL(simple_strtol);
/**
* simple_strtoll - convert a string to a signed long long
* @cp: The start of the string
* @endp: A pointer to the end of the parsed string will be placed here
* @base: The number base to use
*
* This function is obsolete. Please use kstrtoll instead.
*/
long long simple_strtoll(const char *cp, char **endp, unsigned int base) long long simple_strtoll(const char *cp, char **endp, unsigned int base)
{ {
if (*cp == '-') return strtoll(cp, endp, base);
return -simple_strtoull(cp + 1, endp, base); }
return simple_strtoull(cp, endp, base); long simple_strtol(const char *cp, char **endp, unsigned int base)
{
return strtol(cp, endp, base);
} }
EXPORT_SYMBOL(simple_strtoll);