proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-07-27 10:51:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2666 from 2xsec/bugfix

Browse Source 
cgroups: remove unnecessary line
This commit is contained in:
Christian Brauner 2018-10-02 12:50:51 +02:00 committed by GitHub
commit 907e133201
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/include/netns_ifaddrs.c
View File

@ -495,44 +495,6 @@ static int __rtnl_enumerate(int link_af, int addr_af, __s32 netns_id,
return r; return r;
} }
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wcast-align"
/* Get a pointer to the address structure from a sockaddr. */
static void *get_addr_ptr(struct sockaddr *sockaddr_ptr)
{
if (sockaddr_ptr->sa_family == AF_INET)
return &((struct sockaddr_in *)sockaddr_ptr)->sin_addr;
if (sockaddr_ptr->sa_family == AF_INET6)
return &((struct sockaddr_in6 *)sockaddr_ptr)->sin6_addr;
return NULL;
}
#pragma GCC diagnostic pop
static char *get_packet_address(struct sockaddr *sockaddr_ptr, char *buf, size_t buflen)
{
char *slider = buf;
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wcast-align"
unsigned char *m = ((struct sockaddr_ll *)sockaddr_ptr)->sll_addr;
unsigned char n = ((struct sockaddr_ll *)sockaddr_ptr)->sll_halen;
#pragma GCC diagnostic pop
for (unsigned char i = 0; i < n; i++) {
int ret;
ret = snprintf(slider, buflen, "%02x%s", m[i], (i + 1) < n ? ":" : "");
if (ret < 0 || (size_t)ret >= buflen)
return NULL;
buflen -= ret;
slider = (slider + ret);
}
return buf;
}
void netns_freeifaddrs(struct netns_ifaddrs *ifp) void netns_freeifaddrs(struct netns_ifaddrs *ifp)
{ {
struct netns_ifaddrs *n; struct netns_ifaddrs *n;

2
src/lxc/cgroups/cgfsng.c
View File

@ -136,10 +136,10 @@ static char *cg_legacy_must_prefix_named(char *entry)
len = strlen(entry); len = strlen(entry);
prefixed = must_alloc(len + 6); prefixed = must_alloc(len + 6);
memcpy(prefixed, "name=", STRLITERALLEN("name=")); memcpy(prefixed, "name=", STRLITERALLEN("name="));
memcpy(prefixed + STRLITERALLEN("name="), entry, len); memcpy(prefixed + STRLITERALLEN("name="), entry, len);
prefixed[len + 5] = '\0'; prefixed[len + 5] = '\0';
return prefixed; return prefixed;
} }