mirror of
https://gitlab.freedesktop.org/xorg/lib/libx11.git
synced 2026-05-24 21:58:15 +02:00
0b7fd7dbec
This patch removes some redundant null checks before free. It should not change the code otherwise. Be aware that this is only the first series. Signed-off-by: Harms <wharms@bfs,de> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
95 lines
2.7 KiB
C
95 lines
2.7 KiB
C
/*
|
|
|
|
Copyright 1986, 1998 The Open Group
|
|
|
|
Permission to use, copy, modify, distribute, and sell this software and its
|
|
documentation for any purpose is hereby granted without fee, provided that
|
|
the above copyright notice appear in all copies and that both that
|
|
copyright notice and this permission notice appear in supporting
|
|
documentation.
|
|
|
|
The above copyright notice and this permission notice shall be included in
|
|
all copies or substantial portions of the Software.
|
|
|
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
|
|
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
|
|
Except as contained in this notice, the name of The Open Group shall not be
|
|
used in advertising or otherwise to promote the sale, use or other dealings
|
|
in this Software without prior written authorization from The Open Group.
|
|
|
|
*/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include <config.h>
|
|
#endif
|
|
#include <X11/Xlibint.h>
|
|
#include <X11/Xatom.h>
|
|
#include <X11/Xos.h>
|
|
#include <stdio.h>
|
|
|
|
|
|
Status XFetchName (
|
|
register Display *dpy,
|
|
Window w,
|
|
char **name)
|
|
{
|
|
Atom actual_type;
|
|
int actual_format;
|
|
unsigned long nitems;
|
|
unsigned long leftover;
|
|
unsigned char *data = NULL;
|
|
if (XGetWindowProperty(dpy, w, XA_WM_NAME, 0L, (long)BUFSIZ, False, XA_STRING,
|
|
&actual_type,
|
|
&actual_format, &nitems, &leftover, &data) != Success) {
|
|
*name = NULL;
|
|
return (0);
|
|
}
|
|
if ( (actual_type == XA_STRING) && (actual_format == 8) ) {
|
|
|
|
/* The data returned by XGetWindowProperty is guarranteed to
|
|
contain one extra byte that is null terminated to make retrieveing
|
|
string properties easy. */
|
|
|
|
*name = (char *)data;
|
|
return(1);
|
|
}
|
|
Xfree (data);
|
|
*name = NULL;
|
|
return(0);
|
|
}
|
|
|
|
Status XGetIconName (
|
|
register Display *dpy,
|
|
Window w,
|
|
char **icon_name)
|
|
{
|
|
Atom actual_type;
|
|
int actual_format;
|
|
unsigned long nitems;
|
|
unsigned long leftover;
|
|
unsigned char *data = NULL;
|
|
if (XGetWindowProperty(dpy, w, XA_WM_ICON_NAME, 0L, (long)BUFSIZ, False,
|
|
XA_STRING,
|
|
&actual_type,
|
|
&actual_format, &nitems, &leftover, &data) != Success) {
|
|
*icon_name = NULL;
|
|
return (0);
|
|
}
|
|
if ( (actual_type == XA_STRING) && (actual_format == 8) ) {
|
|
|
|
/* The data returned by XGetWindowProperty is guarranteed to
|
|
contain one extra byte that is null terminated to make retrieveing
|
|
string properties easy. */
|
|
|
|
*icon_name = (char*)data;
|
|
return(1);
|
|
}
|
|
Xfree (data);
|
|
*icon_name = NULL;
|
|
return(0);
|
|
}
|