Merge "Address const issues in preparation for libcxx rebase."

This commit is contained in:
Dan Austin 2016-03-28 22:35:51 +00:00 committed by Gerrit Code Review
commit 7f84a0700c

View file

@ -413,7 +413,7 @@ static void parse_event(const char *msg, struct uevent *uevent)
static char **get_character_device_symlinks(struct uevent *uevent) static char **get_character_device_symlinks(struct uevent *uevent)
{ {
const char *parent; const char *parent;
char *slash; const char *slash;
char **links; char **links;
int link_num = 0; int link_num = 0;
int width; int width;
@ -467,7 +467,7 @@ static char **get_block_device_symlinks(struct uevent *uevent)
{ {
const char *device; const char *device;
struct platform_node *pdev; struct platform_node *pdev;
char *slash; const char *slash;
const char *type; const char *type;
char buf[256]; char buf[256];
char link_path[256]; char link_path[256];