Module Name: src
Committed By: kamil
Date: Mon Nov 2 01:06:15 UTC 2015
Modified Files:
src/lib/libpanel: above.c bottom.c del.c hidden.c new.c panel.h
panel_impl.h replace.c show.c top.c window.c
Log Message:
No functional changes
Make this code nicer for C++ compilers, don't assign char* to void*.
Add extra __prefix_false() CPU hint for failed malloc(3).
Normalize whitespace.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/libpanel/above.c
cvs rdiff -u -r1.1 -r1.2 src/lib/libpanel/bottom.c src/lib/libpanel/del.c \
src/lib/libpanel/hidden.c src/lib/libpanel/new.c src/lib/libpanel/panel.h \
src/lib/libpanel/panel_impl.h src/lib/libpanel/replace.c \
src/lib/libpanel/show.c src/lib/libpanel/top.c src/lib/libpanel/window.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpanel/above.c
diff -u src/lib/libpanel/above.c:1.2 src/lib/libpanel/above.c:1.3
--- src/lib/libpanel/above.c:1.2 Sun Nov 1 01:40:23 2015
+++ src/lib/libpanel/above.c Mon Nov 2 01:06:15 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: above.c,v 1.2 2015/11/01 01:40:23 uwe Exp $ */
+/* $NetBSD: above.c,v 1.3 2015/11/02 01:06:15 kamil Exp $ */
/*
* Copyright (c) 2015 Valery Ushakov
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: above.c,v 1.2 2015/11/01 01:40:23 uwe Exp $");
+__RCSID("$NetBSD: above.c,v 1.3 2015/11/02 01:06:15 kamil Exp $");
#include "panel_impl.h"
@@ -34,7 +34,6 @@ __RCSID("$NetBSD: above.c,v 1.2 2015/11/
PANEL *
panel_above(PANEL *p)
{
-
if (p == NULL) {
if (TAILQ_EMPTY(&_deck))
return NULL;
Index: src/lib/libpanel/bottom.c
diff -u src/lib/libpanel/bottom.c:1.1 src/lib/libpanel/bottom.c:1.2
--- src/lib/libpanel/bottom.c:1.1 Mon Oct 26 23:09:49 2015
+++ src/lib/libpanel/bottom.c Mon Nov 2 01:06:15 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: bottom.c,v 1.1 2015/10/26 23:09:49 uwe Exp $ */
+/* $NetBSD: bottom.c,v 1.2 2015/11/02 01:06:15 kamil Exp $ */
/*
* Copyright (c) 2015 Valery Ushakov
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: bottom.c,v 1.1 2015/10/26 23:09:49 uwe Exp $");
+__RCSID("$NetBSD: bottom.c,v 1.2 2015/11/02 01:06:15 kamil Exp $");
#include "panel_impl.h"
@@ -34,7 +34,6 @@ __RCSID("$NetBSD: bottom.c,v 1.1 2015/10
int
bottom_panel(PANEL *p)
{
-
if (__predict_false(p == NULL))
return ERR;
Index: src/lib/libpanel/del.c
diff -u src/lib/libpanel/del.c:1.1 src/lib/libpanel/del.c:1.2
--- src/lib/libpanel/del.c:1.1 Mon Oct 26 23:09:49 2015
+++ src/lib/libpanel/del.c Mon Nov 2 01:06:15 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: del.c,v 1.1 2015/10/26 23:09:49 uwe Exp $ */
+/* $NetBSD: del.c,v 1.2 2015/11/02 01:06:15 kamil Exp $ */
/*
* Copyright (c) 2015 Valery Ushakov
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: del.c,v 1.1 2015/10/26 23:09:49 uwe Exp $");
+__RCSID("$NetBSD: del.c,v 1.2 2015/11/02 01:06:15 kamil Exp $");
#include "panel_impl.h"
@@ -37,7 +37,6 @@ __RCSID("$NetBSD: del.c,v 1.1 2015/10/26
int
del_panel(PANEL *p)
{
-
if (__predict_false(p == NULL))
return ERR;
Index: src/lib/libpanel/hidden.c
diff -u src/lib/libpanel/hidden.c:1.1 src/lib/libpanel/hidden.c:1.2
--- src/lib/libpanel/hidden.c:1.1 Mon Oct 26 23:09:49 2015
+++ src/lib/libpanel/hidden.c Mon Nov 2 01:06:15 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: hidden.c,v 1.1 2015/10/26 23:09:49 uwe Exp $ */
+/* $NetBSD: hidden.c,v 1.2 2015/11/02 01:06:15 kamil Exp $ */
/*
* Copyright (c) 2015 Valery Ushakov
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: hidden.c,v 1.1 2015/10/26 23:09:49 uwe Exp $");
+__RCSID("$NetBSD: hidden.c,v 1.2 2015/11/02 01:06:15 kamil Exp $");
#include "panel_impl.h"
@@ -34,7 +34,6 @@ __RCSID("$NetBSD: hidden.c,v 1.1 2015/10
int
panel_hidden(PANEL *p)
{
-
if (p == NULL)
return ERR;
Index: src/lib/libpanel/new.c
diff -u src/lib/libpanel/new.c:1.1 src/lib/libpanel/new.c:1.2
--- src/lib/libpanel/new.c:1.1 Mon Oct 26 23:09:49 2015
+++ src/lib/libpanel/new.c Mon Nov 2 01:06:15 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: new.c,v 1.1 2015/10/26 23:09:49 uwe Exp $ */
+/* $NetBSD: new.c,v 1.2 2015/11/02 01:06:15 kamil Exp $ */
/*
* Copyright (c) 2015 Valery Ushakov
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: new.c,v 1.1 2015/10/26 23:09:49 uwe Exp $");
+__RCSID("$NetBSD: new.c,v 1.2 2015/11/02 01:06:15 kamil Exp $");
#include "panel_impl.h"
@@ -37,17 +37,17 @@ __RCSID("$NetBSD: new.c,v 1.1 2015/10/26
static PANEL *
_new_panel(WINDOW *w)
{
- PANEL *p;
+ PANEL *p;
- p = (PANEL *)malloc(sizeof(PANEL));
- if (p == NULL)
- return NULL;
+ p = (PANEL *)malloc(sizeof(PANEL));
+ if (__predict_false(p == NULL))
+ return NULL;
- p->win = w;
- p->user = NULL;
+ p->win = w;
+ p->user = NULL;
- DECK_INSERT_TOP(p);
- return p;
+ DECK_INSERT_TOP(p);
+ return p;
}
Index: src/lib/libpanel/panel.h
diff -u src/lib/libpanel/panel.h:1.1 src/lib/libpanel/panel.h:1.2
--- src/lib/libpanel/panel.h:1.1 Mon Oct 26 23:09:49 2015
+++ src/lib/libpanel/panel.h Mon Nov 2 01:06:15 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: panel.h,v 1.1 2015/10/26 23:09:49 uwe Exp $ */
+/* $NetBSD: panel.h,v 1.2 2015/11/02 01:06:15 kamil Exp $ */
/*
* Copyright (c) 2015 Valery Ushakov
@@ -34,7 +34,6 @@
typedef struct __panel PANEL;
__BEGIN_DECLS
-
PANEL *new_panel(WINDOW *);
int del_panel(PANEL *);
Index: src/lib/libpanel/panel_impl.h
diff -u src/lib/libpanel/panel_impl.h:1.1 src/lib/libpanel/panel_impl.h:1.2
--- src/lib/libpanel/panel_impl.h:1.1 Mon Oct 26 23:09:49 2015
+++ src/lib/libpanel/panel_impl.h Mon Nov 2 01:06:15 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: panel_impl.h,v 1.1 2015/10/26 23:09:49 uwe Exp $ */
+/* $NetBSD: panel_impl.h,v 1.2 2015/11/02 01:06:15 kamil Exp $ */
/*
* Copyright (c) 2015 Valery Ushakov
@@ -42,7 +42,7 @@
*/
struct __panel {
WINDOW *win;
- void *user;
+ char *user;
DECK_ENTRY zorder;
};
Index: src/lib/libpanel/replace.c
diff -u src/lib/libpanel/replace.c:1.1 src/lib/libpanel/replace.c:1.2
--- src/lib/libpanel/replace.c:1.1 Mon Oct 26 23:09:49 2015
+++ src/lib/libpanel/replace.c Mon Nov 2 01:06:15 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: replace.c,v 1.1 2015/10/26 23:09:49 uwe Exp $ */
+/* $NetBSD: replace.c,v 1.2 2015/11/02 01:06:15 kamil Exp $ */
/*
* Copyright (c) 2015 Valery Ushakov
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: replace.c,v 1.1 2015/10/26 23:09:49 uwe Exp $");
+__RCSID("$NetBSD: replace.c,v 1.2 2015/11/02 01:06:15 kamil Exp $");
#include "panel_impl.h"
@@ -34,7 +34,6 @@ __RCSID("$NetBSD: replace.c,v 1.1 2015/1
int
replace_panel(PANEL *p, WINDOW *w)
{
-
if (__predict_false(p == NULL || w == NULL))
return ERR;
Index: src/lib/libpanel/show.c
diff -u src/lib/libpanel/show.c:1.1 src/lib/libpanel/show.c:1.2
--- src/lib/libpanel/show.c:1.1 Mon Oct 26 23:09:49 2015
+++ src/lib/libpanel/show.c Mon Nov 2 01:06:15 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: show.c,v 1.1 2015/10/26 23:09:49 uwe Exp $ */
+/* $NetBSD: show.c,v 1.2 2015/11/02 01:06:15 kamil Exp $ */
/*
* Copyright (c) 2015 Valery Ushakov
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: show.c,v 1.1 2015/10/26 23:09:49 uwe Exp $");
+__RCSID("$NetBSD: show.c,v 1.2 2015/11/02 01:06:15 kamil Exp $");
#include "panel_impl.h"
@@ -34,7 +34,6 @@ __RCSID("$NetBSD: show.c,v 1.1 2015/10/2
int
show_panel(PANEL *p)
{
-
if (__predict_false(p == NULL))
return ERR;
Index: src/lib/libpanel/top.c
diff -u src/lib/libpanel/top.c:1.1 src/lib/libpanel/top.c:1.2
--- src/lib/libpanel/top.c:1.1 Mon Oct 26 23:09:49 2015
+++ src/lib/libpanel/top.c Mon Nov 2 01:06:15 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: top.c,v 1.1 2015/10/26 23:09:49 uwe Exp $ */
+/* $NetBSD: top.c,v 1.2 2015/11/02 01:06:15 kamil Exp $ */
/*
* Copyright (c) 2015 Valery Ushakov
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: top.c,v 1.1 2015/10/26 23:09:49 uwe Exp $");
+__RCSID("$NetBSD: top.c,v 1.2 2015/11/02 01:06:15 kamil Exp $");
#include "panel_impl.h"
@@ -34,7 +34,6 @@ __RCSID("$NetBSD: top.c,v 1.1 2015/10/26
int
top_panel(PANEL *p)
{
-
if (__predict_false(p == NULL))
return ERR;
Index: src/lib/libpanel/window.c
diff -u src/lib/libpanel/window.c:1.1 src/lib/libpanel/window.c:1.2
--- src/lib/libpanel/window.c:1.1 Mon Oct 26 23:09:49 2015
+++ src/lib/libpanel/window.c Mon Nov 2 01:06:15 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: window.c,v 1.1 2015/10/26 23:09:49 uwe Exp $ */
+/* $NetBSD: window.c,v 1.2 2015/11/02 01:06:15 kamil Exp $ */
/*
* Copyright (c) 2015 Valery Ushakov
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: window.c,v 1.1 2015/10/26 23:09:49 uwe Exp $");
+__RCSID("$NetBSD: window.c,v 1.2 2015/11/02 01:06:15 kamil Exp $");
#include "panel_impl.h"
@@ -34,10 +34,8 @@ __RCSID("$NetBSD: window.c,v 1.1 2015/10
WINDOW *
panel_window(PANEL *p)
{
-
if (p == NULL)
return NULL;
return p->win;
}
-
