Discard pane->_data.

This doesn't have a use any more, so discard it.

Signed-off-by: NeilBrown <neil@brown.name>

diff --git a/core-pane.c b/core-pane.c
index 3b531ecbbd2f0a5c515c45a14af05a5512a4e88b..b772bc9ea366a9f006997bb121f27f1517e2a63f 100644 (file)
--- a/core-pane.c
+++ b/core-pane.c
@@ -32,7 +32,9 @@
 #include <ctype.h>
 #include <stdio.h>
 
+#define PANE_DATA_PTR_TYPE void *
 #include "core.h"
+#include "core-pane.h"
 #include "internal.h"
 
 MEMPOOL(pane);
@@ -156,7 +158,7 @@ static struct pane *_do_pane_register(struct pane *parent, short z,
 
        if (data)
                alloc_size = sizeof(data);
-       alloc_size += offsetof(struct pane, _data);
+       alloc_size += offsetof(struct pane, data);
 
        p = alloc_zbuf(alloc_size, pane);
        pane_init(p, parent);
@@ -166,7 +168,7 @@ static struct pane *_do_pane_register(struct pane *parent, short z,
                p->abs_z = parent->abs_z + 1;
        p->handle = command_get(handle);
        if (data)
-               p->_data = data;
+               p->data = data;
 
        p->name = handle->name;
        if (z >= 0) {
@@ -772,9 +774,9 @@ void pane_subsume(struct pane *p safe, struct pane *parent safe)
        parent->handle = p->handle;
        p->handle = handle;
 
-       data = parent->_data;
-       parent->_data = p->_data;
-       p->_data = data;
+       data = parent->data;
+       parent->data = p->data;
+       p->data = data;
 
        parent->damaged |= p->damaged;
        pane_damaged(p, DAMAGED_SIZE);

diff --git a/core-pane.h b/core-pane.h
index 373bad4424c8b06e544e8ee9a439631ae63dc2a4..2d819e1079982f70e1aa813bfcbdf4f1bfaf64a1 100644 (file)
--- a/core-pane.h
+++ b/core-pane.h
@@ -49,7 +49,6 @@ struct pane {
 #ifdef PANE_DATA_PTR_TYPE_3
                PANE_DATA_PTR_TYPE_3 data3 safe;
 #endif
-               void            *_data safe;
        };
 };