| Message ID | 20170903043853.17899-1-eric@anholt.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sat, Sep 02, 2017 at 09:38:51PM -0700, Eric Anholt wrote: > Signed-off-by: Eric Anholt <eric@anholt.net> > --- > > This little series cleans up many compiler warnings I saw when testing > danvet's meson branch. On the series: Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> I've pulled in your other meson patches, they need minimal polish (e.g. my gcc doesn't have all the -W flags yours has, resulting in warnings about unknown flags without first checking for them). -Daniel > > lib/igt_debugfs.c | 4 ++-- > lib/igt_sysfs.c | 4 ++-- > tests/kms_hdmi_inject.c | 2 +- > tests/pm_rpm.c | 4 ++-- > 4 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/lib/igt_debugfs.c b/lib/igt_debugfs.c > index 090b56e03555..63183e57229b 100644 > --- a/lib/igt_debugfs.c > +++ b/lib/igt_debugfs.c > @@ -491,7 +491,7 @@ static void igt_pipe_crc_reset(int drm_fd) > } > > while ((dirent = readdir(dir))) { > - char buf[128]; > + char buf[PATH_MAX]; > > if (strcmp(dirent->d_name, "crtc-") != 0) > continue; > @@ -525,7 +525,7 @@ static void igt_pipe_crc_reset(int drm_fd) > static void pipe_crc_exit_handler(int sig) > { > struct dirent *dirent; > - char buf[128]; > + char buf[PATH_MAX]; > DIR *dir; > int fd; > > diff --git a/lib/igt_sysfs.c b/lib/igt_sysfs.c > index 15ed34be0088..9227e374bf44 100644 > --- a/lib/igt_sysfs.c > +++ b/lib/igt_sysfs.c > @@ -192,7 +192,7 @@ int igt_sysfs_open_parameters(int device) > if (params < 0) { /* builtin? */ > drm_version_t version; > char name[32] = ""; > - char path[128]; > + char path[PATH_MAX]; > > memset(&version, 0, sizeof(version)); > version.name_len = sizeof(name); > @@ -499,7 +499,7 @@ void kick_fbcon(bool enable) > return; > > while ((de = readdir(dir))) { > - char buf[128]; > + char buf[PATH_MAX]; > int fd, len; > > if (strncmp(de->d_name, "vtcon", 5)) > diff --git a/tests/kms_hdmi_inject.c b/tests/kms_hdmi_inject.c > index cb916acec3c1..22570a4b637a 100644 > --- a/tests/kms_hdmi_inject.c > +++ b/tests/kms_hdmi_inject.c > @@ -170,7 +170,7 @@ eld_is_valid(void) > continue; > > while ((snd_hda = readdir(dir))) { > - char fpath[128]; > + char fpath[PATH_MAX]; > > if (*snd_hda->d_name == '.' || > strstr(snd_hda->d_name, "eld") == 0) > diff --git a/tests/pm_rpm.c b/tests/pm_rpm.c > index 47c9f1143484..9e8cf79b5128 100644 > --- a/tests/pm_rpm.c > +++ b/tests/pm_rpm.c > @@ -594,14 +594,14 @@ static int count_i2c_valid_edids(void) > DIR *dir; > > struct dirent *dirent; > - char full_name[32]; > + char full_name[PATH_MAX]; > > dir = opendir("/dev/"); > igt_assert(dir); > > while ((dirent = readdir(dir))) { > if (strncmp(dirent->d_name, "i2c-", 4) == 0) { > - snprintf(full_name, 32, "/dev/%s", dirent->d_name); > + sprintf(full_name, "/dev/%s", dirent->d_name); > fd = open(full_name, O_RDWR); > igt_assert_neq(fd, -1); > if (i2c_edid_is_valid(fd)) > -- > 2.14.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Mon, Sep 04, 2017 at 10:49:46AM +0200, Daniel Vetter wrote: > On Sat, Sep 02, 2017 at 09:38:51PM -0700, Eric Anholt wrote: > > Signed-off-by: Eric Anholt <eric@anholt.net> > > --- > > > > This little series cleans up many compiler warnings I saw when testing > > danvet's meson branch. > > On the series: Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > > I've pulled in your other meson patches, they need minimal polish (e.g. my > gcc doesn't have all the -W flags yours has, resulting in warnings about > unknown flags without first checking for them). Seems like you're on vacations already, so pulled them all in. Thanks, Daniel > -Daniel > > > > lib/igt_debugfs.c | 4 ++-- > > lib/igt_sysfs.c | 4 ++-- > > tests/kms_hdmi_inject.c | 2 +- > > tests/pm_rpm.c | 4 ++-- > > 4 files changed, 7 insertions(+), 7 deletions(-) > > > > diff --git a/lib/igt_debugfs.c b/lib/igt_debugfs.c > > index 090b56e03555..63183e57229b 100644 > > --- a/lib/igt_debugfs.c > > +++ b/lib/igt_debugfs.c > > @@ -491,7 +491,7 @@ static void igt_pipe_crc_reset(int drm_fd) > > } > > > > while ((dirent = readdir(dir))) { > > - char buf[128]; > > + char buf[PATH_MAX]; > > > > if (strcmp(dirent->d_name, "crtc-") != 0) > > continue; > > @@ -525,7 +525,7 @@ static void igt_pipe_crc_reset(int drm_fd) > > static void pipe_crc_exit_handler(int sig) > > { > > struct dirent *dirent; > > - char buf[128]; > > + char buf[PATH_MAX]; > > DIR *dir; > > int fd; > > > > diff --git a/lib/igt_sysfs.c b/lib/igt_sysfs.c > > index 15ed34be0088..9227e374bf44 100644 > > --- a/lib/igt_sysfs.c > > +++ b/lib/igt_sysfs.c > > @@ -192,7 +192,7 @@ int igt_sysfs_open_parameters(int device) > > if (params < 0) { /* builtin? */ > > drm_version_t version; > > char name[32] = ""; > > - char path[128]; > > + char path[PATH_MAX]; > > > > memset(&version, 0, sizeof(version)); > > version.name_len = sizeof(name); > > @@ -499,7 +499,7 @@ void kick_fbcon(bool enable) > > return; > > > > while ((de = readdir(dir))) { > > - char buf[128]; > > + char buf[PATH_MAX]; > > int fd, len; > > > > if (strncmp(de->d_name, "vtcon", 5)) > > diff --git a/tests/kms_hdmi_inject.c b/tests/kms_hdmi_inject.c > > index cb916acec3c1..22570a4b637a 100644 > > --- a/tests/kms_hdmi_inject.c > > +++ b/tests/kms_hdmi_inject.c > > @@ -170,7 +170,7 @@ eld_is_valid(void) > > continue; > > > > while ((snd_hda = readdir(dir))) { > > - char fpath[128]; > > + char fpath[PATH_MAX]; > > > > if (*snd_hda->d_name == '.' || > > strstr(snd_hda->d_name, "eld") == 0) > > diff --git a/tests/pm_rpm.c b/tests/pm_rpm.c > > index 47c9f1143484..9e8cf79b5128 100644 > > --- a/tests/pm_rpm.c > > +++ b/tests/pm_rpm.c > > @@ -594,14 +594,14 @@ static int count_i2c_valid_edids(void) > > DIR *dir; > > > > struct dirent *dirent; > > - char full_name[32]; > > + char full_name[PATH_MAX]; > > > > dir = opendir("/dev/"); > > igt_assert(dir); > > > > while ((dirent = readdir(dir))) { > > if (strncmp(dirent->d_name, "i2c-", 4) == 0) { > > - snprintf(full_name, 32, "/dev/%s", dirent->d_name); > > + sprintf(full_name, "/dev/%s", dirent->d_name); > > fd = open(full_name, O_RDWR); > > igt_assert_neq(fd, -1); > > if (i2c_edid_is_valid(fd)) > > -- > > 2.14.1 > > > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/intel-gfx > > -- > Daniel Vetter > Software Engineer, Intel Corporation > http://blog.ffwll.ch
diff --git a/lib/igt_debugfs.c b/lib/igt_debugfs.c index 090b56e03555..63183e57229b 100644 --- a/lib/igt_debugfs.c +++ b/lib/igt_debugfs.c @@ -491,7 +491,7 @@ static void igt_pipe_crc_reset(int drm_fd) } while ((dirent = readdir(dir))) { - char buf[128]; + char buf[PATH_MAX]; if (strcmp(dirent->d_name, "crtc-") != 0) continue; @@ -525,7 +525,7 @@ static void igt_pipe_crc_reset(int drm_fd) static void pipe_crc_exit_handler(int sig) { struct dirent *dirent; - char buf[128]; + char buf[PATH_MAX]; DIR *dir; int fd; diff --git a/lib/igt_sysfs.c b/lib/igt_sysfs.c index 15ed34be0088..9227e374bf44 100644 --- a/lib/igt_sysfs.c +++ b/lib/igt_sysfs.c @@ -192,7 +192,7 @@ int igt_sysfs_open_parameters(int device) if (params < 0) { /* builtin? */ drm_version_t version; char name[32] = ""; - char path[128]; + char path[PATH_MAX]; memset(&version, 0, sizeof(version)); version.name_len = sizeof(name); @@ -499,7 +499,7 @@ void kick_fbcon(bool enable) return; while ((de = readdir(dir))) { - char buf[128]; + char buf[PATH_MAX]; int fd, len; if (strncmp(de->d_name, "vtcon", 5)) diff --git a/tests/kms_hdmi_inject.c b/tests/kms_hdmi_inject.c index cb916acec3c1..22570a4b637a 100644 --- a/tests/kms_hdmi_inject.c +++ b/tests/kms_hdmi_inject.c @@ -170,7 +170,7 @@ eld_is_valid(void) continue; while ((snd_hda = readdir(dir))) { - char fpath[128]; + char fpath[PATH_MAX]; if (*snd_hda->d_name == '.' || strstr(snd_hda->d_name, "eld") == 0) diff --git a/tests/pm_rpm.c b/tests/pm_rpm.c index 47c9f1143484..9e8cf79b5128 100644 --- a/tests/pm_rpm.c +++ b/tests/pm_rpm.c @@ -594,14 +594,14 @@ static int count_i2c_valid_edids(void) DIR *dir; struct dirent *dirent; - char full_name[32]; + char full_name[PATH_MAX]; dir = opendir("/dev/"); igt_assert(dir); while ((dirent = readdir(dir))) { if (strncmp(dirent->d_name, "i2c-", 4) == 0) { - snprintf(full_name, 32, "/dev/%s", dirent->d_name); + sprintf(full_name, "/dev/%s", dirent->d_name); fd = open(full_name, O_RDWR); igt_assert_neq(fd, -1); if (i2c_edid_is_valid(fd))
Signed-off-by: Eric Anholt <eric@anholt.net> --- This little series cleans up many compiler warnings I saw when testing danvet's meson branch. lib/igt_debugfs.c | 4 ++-- lib/igt_sysfs.c | 4 ++-- tests/kms_hdmi_inject.c | 2 +- tests/pm_rpm.c | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-)