Skip to content

Remove unused functions/definitions from ink_defs #8714

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
randall merged 1 commit into from
Mar 7, 2022
Merged

Remove unused functions/definitions from ink_defs #8714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 1 addition & 18 deletions include/tscore/ink_defs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,15 @@
#pragma once

#include "tscore/ink_config.h"

#include <stddef.h> // NOLINT(modernize-deprecated-headers)
#include <sys/mman.h>

#ifdef HAVE_STDINT_H
#include <stdint.h> // NOLINT(modernize-deprecated-headers)
#else
// TODO: Add "standard" int types?
#endif

#ifdef HAVE_INTTYPES_H
#include <inttypes.h> // NOLINT(modernize-deprecated-headers)
#else
// TODO: add PRI*64 stuff?
#endif

#ifndef INT64_MIN
Expand All @@ -61,11 +57,6 @@
#endif
#endif

#if defined(darwin)
#define RENTRENT_GETHOSTBYNAME
#define RENTRENT_GETHOSTBYADDR
#endif

#define NUL '\0'

// Determine the element count for an array.
Expand Down Expand Up @@ -100,21 +91,13 @@ countof(const T (&)[N])
#define unlikely(x) __builtin_expect(!!(x), 0)
#endif

#if defined(MAP_NORESERVE)
#define MAP_SHARED_MAP_NORESERVE (MAP_SHARED | MAP_NORESERVE)
#else
#define MAP_SHARED_MAP_NORESERVE (MAP_SHARED)
#endif

/* Variables
*/
extern int debug_level;
extern int off;
extern int on;

/* Functions
*/
int ink_sys_name_release(char *name, int namelen, char *release, int releaselen);
int ink_login_name_max();

#ifdef __cplusplus
Expand Down
58 changes: 1 addition & 57 deletions src/tscore/ink_defs.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,67 +30,11 @@

#include "tscore/ink_platform.h"

#if defined(linux) || defined(freebsd) || defined(darwin)
#include <sys/types.h>
#include <sys/param.h>
#endif
#if defined(linux)
#include <sys/utsname.h>
#endif
#include <unistd.h>

int off = 0;
int on = 1;

int
ink_sys_name_release(char *name, int namelen, char *release, int releaselen)
{
*name = 0;
*release = 0;
#if defined(freebsd) || defined(darwin)
int mib[2];
size_t len = namelen;
mib[0] = CTL_KERN;
mib[1] = KERN_OSTYPE;

if (sysctl(mib, 2, name, &len, nullptr, 0) == -1)
return -1;

len = releaselen;
mib[0] = CTL_KERN;
mib[1] = KERN_OSRELEASE;

if (sysctl(mib, 2, release, &len, nullptr, 0) == -1)
return -1;

return 0;
#elif defined(linux)
struct utsname buf;
int n;

if (uname(&buf)) {
return -1;
}

n = strlen(buf.sysname);
if (namelen <= n) {
n = namelen - 1;
}
memcpy(name, buf.sysname, n);
name[n] = 0;

n = strlen(buf.release);
if (releaselen <= n) {
n = releaselen - 1;
}
memcpy(release, buf.release, n);
release[n] = 0;

return 0;
#else
return -1;
#endif
}

int
ink_login_name_max()
{
Expand Down