openbsd/xenocara
1
0
Fork 0
mirror of https://github.com/openbsd/xenocara.git synced 2025-12-09 02:39:00 +00:00
Code Issues Projects Releases Wiki Activity

add, then use, xvasprintf, checking for appropriate return.

Browse Source
This commit is contained in:
okan
2020-01-22 19:58:35 +00:00
parent d37d5f3d84
commit b6e5a98f51
3 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/cwm/calmwm.h
View File

@@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
* *
* $OpenBSD: calmwm.h,v 1.371 2019/03/07 14:28:17 okan Exp $ * $OpenBSD: calmwm.h,v 1.372 2020/01/22 19:58:35 okan Exp $
*/ */
#ifndef _CALMWM_H_ #ifndef _CALMWM_H_
@@ -598,5 +598,7 @@ char *xstrdup(const char *);
int xasprintf(char **, const char *, ...) int xasprintf(char **, const char *, ...)
__attribute__((__format__ (printf, 2, 3))) __attribute__((__format__ (printf, 2, 3)))
__attribute__((__nonnull__ (2))); __attribute__((__nonnull__ (2)));
int xvasprintf(char **, const char *, va_list)
__attribute__((__nonnull__ (2)));
#endif /* _CALMWM_H_ */ #endif /* _CALMWM_H_ */

7
app/cwm/screen.c
View File

@@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
* *
* $OpenBSD: screen.c,v 1.93 2019/03/08 20:33:30 okan Exp $ * $OpenBSD: screen.c,v 1.94 2020/01/22 19:58:35 okan Exp $
*/ */
#include <sys/types.h> #include <sys/types.h>
@@ -275,15 +275,12 @@ void
screen_prop_win_draw(struct screen_ctx *sc, const char *fmt, ...) screen_prop_win_draw(struct screen_ctx *sc, const char *fmt, ...)
{ {
va_list ap; va_list ap;
int i;
char *text; char *text;
XGlyphInfo extents; XGlyphInfo extents;
va_start(ap, fmt); va_start(ap, fmt);
i = vasprintf(&text, fmt, ap); xvasprintf(&text, fmt, ap);
va_end(ap); va_end(ap);
if (i < 0 || text == NULL)
err(1, "vasprintf");
XftTextExtentsUtf8(X_Dpy, sc->xftfont, (const FcChar8*)text, XftTextExtentsUtf8(X_Dpy, sc->xftfont, (const FcChar8*)text,
strlen(text), &extents); strlen(text), &extents);

19
app/cwm/xmalloc.c
View File

@@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
* *
* $OpenBSD: xmalloc.c,v 1.15 2015/03/28 23:12:47 okan Exp $ * $OpenBSD: xmalloc.c,v 1.16 2020/01/22 19:58:35 okan Exp $
*/ */
#include <sys/types.h> #include <sys/types.h>
@@ -91,11 +91,20 @@ xasprintf(char **ret, const char *fmt, ...)
int i; int i;
va_start(ap, fmt); va_start(ap, fmt);
i = vasprintf(ret, fmt, ap); i = xvasprintf(ret, fmt, ap);
va_end(ap); va_end(ap);
if (i < 0 || *ret == NULL) return(i);
err(1, "asprintf"); }
int
xvasprintf(char **ret, const char *fmt, va_list ap)
{
int i;
i = vasprintf(ret, fmt, ap);
if (i == -1)
err(1, "vasprintf");
return(i); return(i);
} }