From 8510f61acdf83ef524e694b9b0eebeb7ad834162 Mon Sep 17 00:00:00 2001 From: Xin LI Date: Thu, 9 Jul 2020 02:52:39 +0000 Subject: sys/geom: consistently use _PATH_DEV instead of hardcoding "/dev/". Reviewed by: cem MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D25565 --- sys/geom/nop/g_nop.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'sys/geom/nop') diff --git a/sys/geom/nop/g_nop.c b/sys/geom/nop/g_nop.c index a799cd761495..e0dd92ef20a1 100644 --- a/sys/geom/nop/g_nop.c +++ b/sys/geom/nop/g_nop.c @@ -676,8 +676,8 @@ g_nop_ctl_create(struct gctl_req *req, struct g_class *mp) gctl_error(req, "No 'arg%d' argument", i); return; } - if (strncmp(name, "/dev/", strlen("/dev/")) == 0) - name += strlen("/dev/"); + if (strncmp(name, _PATH_DEV, strlen(_PATH_DEV)) == 0) + name += strlen(_PATH_DEV); pp = g_provider_by_name(name); if (pp == NULL) { G_NOP_DEBUG(1, "Provider %s is invalid.", name); @@ -787,8 +787,8 @@ g_nop_ctl_configure(struct gctl_req *req, struct g_class *mp) gctl_error(req, "No 'arg%d' argument", i); return; } - if (strncmp(name, "/dev/", strlen("/dev/")) == 0) - name += strlen("/dev/"); + if (strncmp(name, _PATH_DEV, strlen(_PATH_DEV)) == 0) + name += strlen(_PATH_DEV); pp = g_provider_by_name(name); if (pp == NULL || pp->geom->class != mp) { G_NOP_DEBUG(1, "Provider %s is invalid.", name); @@ -857,8 +857,8 @@ g_nop_ctl_destroy(struct gctl_req *req, struct g_class *mp) gctl_error(req, "No 'arg%d' argument", i); return; } - if (strncmp(name, "/dev/", strlen("/dev/")) == 0) - name += strlen("/dev/"); + if (strncmp(name, _PATH_DEV, strlen(_PATH_DEV)) == 0) + name += strlen(_PATH_DEV); gp = g_nop_find_geom(mp, name); if (gp == NULL) { G_NOP_DEBUG(1, "Device %s is invalid.", name); @@ -902,8 +902,8 @@ g_nop_ctl_reset(struct gctl_req *req, struct g_class *mp) gctl_error(req, "No 'arg%d' argument", i); return; } - if (strncmp(name, "/dev/", strlen("/dev/")) == 0) - name += strlen("/dev/"); + if (strncmp(name, _PATH_DEV, strlen(_PATH_DEV)) == 0) + name += strlen(_PATH_DEV); pp = g_provider_by_name(name); if (pp == NULL || pp->geom->class != mp) { G_NOP_DEBUG(1, "Provider %s is invalid.", name); -- cgit v1.2.3