Skip to content

Commit

Permalink
Get rid of xstrdup when argument is definitely non-NULL
Browse files Browse the repository at this point in the history 
Replace xstrdup with strdup when either constant string is
being duplicated or argument is guarded by conditionals and
obviously can't be NULL

Signed-off-by: Mikhail Gusarov <[email protected]>
Reviewed-by: Alan Coopersmith <[email protected]>
  • Loading branch information
@dottedmag
dottedmag committed Jun 11, 2010
1 parent 620ca54 commit 6592db6
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion config/config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,6 @@ add_option(InputOption **options, const char *key, const char *value)
if (!*options) /* Yeesh. */
return;
(*options)->key = xstrdup(key);
(*options)->value = xstrdup(value);
(*options)->value = strdup(value);
(*options)->next = NULL;
}
8 changes: 4 additions & 4 deletions config/dbus.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ add_device(DBusMessage *message, DBusMessage *reply, DBusError *error)
return BadAlloc;
}

options->key = xstrdup("_source");
options->value = xstrdup("client/dbus");
options->key = strdup("_source");
options->value = strdup("client/dbus");
if (!options->key || !options->value) {
ErrorF("[config/dbus] couldn't allocate first key/value pair\n");
ret = BadAlloc;
Expand Down Expand Up @@ -120,7 +120,7 @@ add_device(DBusMessage *message, DBusMessage *reply, DBusError *error)
tmp);
MALFORMED_MESSAGE();
}
options->key = xstrdup(tmp);
options->key = strdup(tmp);
if (!options->key) {
ErrorF("[config/dbus] couldn't duplicate key!\n");
ret = BadAlloc;
Expand All @@ -136,7 +136,7 @@ add_device(DBusMessage *message, DBusMessage *reply, DBusError *error)
dbus_message_iter_get_basic(&subiter, &tmp);
if (!tmp)
MALFORMED_MESSAGE();
options->value = xstrdup(tmp);
options->value = strdup(tmp);
if (!options->value) {
ErrorF("[config/dbus] couldn't duplicate option!\n");
ret = BadAlloc;
Expand Down
14 changes: 7 additions & 7 deletions config/hal.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ get_prop_string(LibHalContext *hal_ctx, const char *udi, const char *name)
prop = libhal_device_get_property_string(hal_ctx, udi, name, NULL);
LogMessageVerb(X_INFO, 10, "config/hal: getting %s on %s returned %s\n", name, udi, prop ? prop : "(null)");
if (prop) {
ret = xstrdup(prop);
ret = strdup(prop);
libhal_free_string(prop);
}
else {
Expand Down Expand Up @@ -156,13 +156,13 @@ device_added(LibHalContext *hal_ctx, const char *udi)
LogMessage(X_WARNING,"config/hal: no driver or path specified for %s\n", udi);
goto unwind;
}
attrs.device = xstrdup(path);
attrs.device = strdup(path);

name = get_prop_string(hal_ctx, udi, "info.product");
if (!name)
name = xstrdup("(unnamed)");
name = strdup("(unnamed)");
else
attrs.product = xstrdup(name);
attrs.product = strdup(name);

attrs.vendor = get_prop_string(hal_ctx, udi, "info.vendor");
hal_tags = get_prop_string(hal_ctx, udi, "input.tags");
Expand Down Expand Up @@ -211,8 +211,8 @@ device_added(LibHalContext *hal_ctx, const char *udi)
goto unwind;
}

options->key = xstrdup("_source");
options->value = xstrdup("server/hal");
options->key = strdup("_source");
options->value = strdup("server/hal");
if (!options->key || !options->value) {
LogMessage(X_ERROR, "config/hal: couldn't allocate first key/value pair\n");
goto unwind;
Expand Down Expand Up @@ -387,7 +387,7 @@ device_added(LibHalContext *hal_ctx, const char *udi)

for (; dev; dev = dev->next){
free(dev->config_info);
dev->config_info = xstrdup(config_info);
dev->config_info = strdup(config_info);
}

unwind:
Expand Down
6 changes: 3 additions & 3 deletions config/udev.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ device_added(struct udev_device *udev_device)
if (!options)
return;

options->key = xstrdup("_source");
options->value = xstrdup("server/udev");
options->key = strdup("_source");
options->value = strdup("server/udev");
if (!options->key || !options->value)
goto unwind;

Expand Down Expand Up @@ -197,7 +197,7 @@ device_added(struct udev_device *udev_device)

for (; dev; dev = dev->next) {
free(dev->config_info);
dev->config_info = xstrdup(config_info);
dev->config_info = strdup(config_info);
}

unwind:
Expand Down
2 changes: 1 addition & 1 deletion dix/dixfonts.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1836,7 +1836,7 @@ SetDefaultFontPath(char *path)
if (!start) {
temp_path = Xprintf("%s%sbuilt-ins", path, *path ? "," : "");
} else {
temp_path = xstrdup(path);
temp_path = strdup(path);
}
if (!temp_path)
return BadAlloc;
Expand Down
2 changes: 1 addition & 1 deletion glx/glxcmds.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2433,7 +2433,7 @@ int __glXDisp_ClientInfo(__GLXclientState *cl, GLbyte *pc)
cl->GLClientminorVersion = req->minor;
free(cl->GLClientextensions);
buf = (const char *)(req+1);
cl->GLClientextensions = xstrdup(buf);
cl->GLClientextensions = strdup(buf);

return Success;
}
6 changes: 3 additions & 3 deletions glx/glxscreens.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -356,9 +356,9 @@ void __glXScreenInit(__GLXscreen *pGlxScreen, ScreenPtr pScreen)
return;

pGlxScreen->pScreen = pScreen;
pGlxScreen->GLextensions = xstrdup(GLServerExtensions);
pGlxScreen->GLXvendor = xstrdup(GLXServerVendorName);
pGlxScreen->GLXextensions = xstrdup(GLXServerExtensions);
pGlxScreen->GLextensions = strdup(GLServerExtensions);
pGlxScreen->GLXvendor = strdup(GLXServerVendorName);
pGlxScreen->GLXextensions = strdup(GLXServerExtensions);

/* All GLX providers must support all of the functionality required for at
* least GLX 1.2. If the provider supports a higher version, the GLXminor
Expand Down
12 changes: 6 additions & 6 deletions xkb/xkbUtils.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1761,15 +1761,15 @@ _XkbCopyGeom(XkbDescPtr src, XkbDescPtr dst)
if (sdoodad->any.type == XkbTextDoodad) {
if (sdoodad->text.text)
ddoodad->text.text =
xstrdup(sdoodad->text.text);
strdup(sdoodad->text.text);
if (sdoodad->text.font)
ddoodad->text.font =
xstrdup(sdoodad->text.font);
strdup(sdoodad->text.font);
}
else if (sdoodad->any.type == XkbLogoDoodad) {
if (sdoodad->logo.logo_name)
ddoodad->logo.logo_name =
xstrdup(sdoodad->logo.logo_name);
strdup(sdoodad->logo.logo_name);
}
}
dsection->overlays = NULL;
Expand Down Expand Up @@ -1832,14 +1832,14 @@ _XkbCopyGeom(XkbDescPtr src, XkbDescPtr dst)
memcpy(ddoodad , sdoodad, sizeof(XkbDoodadRec));
if (sdoodad->any.type == XkbTextDoodad) {
if (sdoodad->text.text)
ddoodad->text.text = xstrdup(sdoodad->text.text);
ddoodad->text.text = strdup(sdoodad->text.text);
if (sdoodad->text.font)
ddoodad->text.font = xstrdup(sdoodad->text.font);
ddoodad->text.font = strdup(sdoodad->text.font);
}
else if (sdoodad->any.type == XkbLogoDoodad) {
if (sdoodad->logo.logo_name)
ddoodad->logo.logo_name =
xstrdup(sdoodad->logo.logo_name);
strdup(sdoodad->logo.logo_name);
}
}

Expand Down

0 comments on commit 6592db6

Please sign in to comment.