'notdef' means it's not used, so we remove it

diff --git a/cde/lib/DtHelp/GifUtils.c b/cde/lib/DtHelp/GifUtils.c
index 003928fe46c9d20578e31dc1dba85cca0e3749c7..666d899e3ca7b311b67aab7a1008be92a3b6e604 100644 (file)
--- a/cde/lib/DtHelp/GifUtils.c
+++ b/cde/lib/DtHelp/GifUtils.c
@@ -245,31 +245,7 @@ DoExtension(byte **inbuf, int label, GifState *g)
     switch (label) {
     case 0x01:        /* Plain Text Extension */
         str = "Plain Text Extension";
-#ifdef notdef
-        if (GetDataBlock(inbuf, (unsigned char*) buf, g) == 0)
-            ;
-
-        lpos   = LM_to_uint(buf[0], buf[1]);
-        tpos   = LM_to_uint(buf[2], buf[3]);
-        width  = LM_to_uint(buf[4], buf[5]);
-        height = LM_to_uint(buf[6], buf[7]);
-        cellw  = buf[8];
-        cellh  = buf[9];
-        foreground = buf[10];
-        background = buf[11];
-
-        while (GetDataBlock(inbuf, (unsigned char*) buf, g) != 0) {
-            PPM_ASSIGN(image[ypos][xpos],
-                    cmap[CM_RED][v],
-                    cmap[CM_GREEN][v],
-                    cmap[CM_BLUE][v]);
-            ++index;
-        }
-
-        return FALSE;
-#else
         break;
-#endif
     case 0xff:        /* Application Extension */
         str = "Application Extension";
         break;

diff --git a/cde/lib/pam/examples/login/login.c b/cde/lib/pam/examples/login/login.c
index 0570a5f9cdd6b732f8804c9ba338a8cf7f31c29e..ffe28b0fb625d59e84bd6f184c27248685e7181e 100644 (file)
--- a/cde/lib/pam/examples/login/login.c
+++ b/cde/lib/pam/examples/login/login.c
@@ -624,17 +624,6 @@ donothing(int sig)
                pam_end(pamh, PAM_ABORT);
 }
 
-#ifdef notdef
-static int     intrupt;
-
-/*ARGSUSED*/
-static void
-catch(int sig)
-{
-       ++intrupt;
-}
-#endif
-
 /*
  *                     *** Bad login logging support ***
  */

diff --git a/cde/lib/tt/bin/ttdbserverd/db_server_functions.C b/cde/lib/tt/bin/ttdbserverd/db_server_functions.C
index 55a9f918e2284605da86665d42c38bda057e6905..d71b4f55fd3c0198f834b8cb2a0140ae5881f80f 100644 (file)
--- a/cde/lib/tt/bin/ttdbserverd/db_server_functions.C
+++ b/cde/lib/tt/bin/ttdbserverd/db_server_functions.C
@@ -1832,24 +1832,12 @@ extern char *           _tt_status_message(Tt_status s);
 _tt_file_netfile_results *
 _tt_file_netfile_1 (_tt_file_netfile_args *args, SVCXPRT * /* transp */)
 {
-
-#ifdef notdef
-printf("DEBUG: SERVER: _tt_file_netfile_1: calling _tt_file_netfile(%s)\n",
-       (char *) args->file_or_netfile);
-#endif
-
        static _tt_file_netfile_results results;
        static char * canonical_path;
 
        // we have a netfilename, get the local file version...
        canonical_path = _tt_file_netfile(args->file_or_netfile);
 
-#ifdef notdef
-printf("DEBUG: SERVER: _tt_file_netfile_1: _tt_file_netfile(%s) returned %s\n",
-       args->file_or_netfile, canonical_path);
-#endif
-
-
        if (_tt_pointer_error(canonical_path) != TT_OK) {
                results.results = TT_DB_ERR_ILLEGAL_FILE;
                results.result_string = NULL;
@@ -1859,11 +1847,6 @@ printf("DEBUG: SERVER: _tt_file_netfile_1: _tt_file_netfile(%s) returned %s\n",
        }
        results.tt_status = (int) _tt_pointer_error(canonical_path);
 
-#ifdef notdef
-printf("\t results.tt_status == %s\n",
-       _tt_status_message(_tt_pointer_error(canonical_path)));
-#endif
-
        return &results;
 }
 
@@ -1873,23 +1856,12 @@ printf("\t results.tt_status == %s\n",
 _tt_file_netfile_results *
 _tt_netfile_file_1 (_tt_file_netfile_args *args, SVCXPRT * /* transp */)
 {
-
-#ifdef notdef
-printf("DEBUG: SERVER: _tt_netfile_file_1: calling _tt_netfile_file(%s)\n",
-       (char *) args->file_or_netfile);
-#endif
-
        static _tt_file_netfile_results results;
        static char * canonical_path;
 
        // we have a netfilename, get the local file version...
        canonical_path = _tt_netfile_file(args->file_or_netfile);
 
-#ifdef notdef
-printf("DEBUG: SERVER: _tt_netfile_file_1: _tt_netfile_file(%s) returned %s\n",
-       args->file_or_netfile, canonical_path);
-#endif
-
        if (_tt_pointer_error(canonical_path) != TT_OK) {
                results.results = TT_DB_ERR_ILLEGAL_FILE;
                results.result_string = NULL;
@@ -1899,11 +1871,6 @@ printf("DEBUG: SERVER: _tt_netfile_file_1: _tt_netfile_file(%s) returned %s\n",
        }
        results.tt_status = (int) _tt_pointer_error(canonical_path);
 
-#ifdef notdef
-printf("\t results.tt_status == %s\n",
-       _tt_status_message(_tt_pointer_error(canonical_path)));
-#endif
-
        return &results;
 }
 

diff --git a/cde/lib/tt/lib/api/c/api_filemap.C b/cde/lib/tt/lib/api/c/api_filemap.C
index 165369868d19d9307a6cc0821445545a5ed641cf..7efdb03b264f89f2c7e7d59c04b6c377c32beb90 100644 (file)
--- a/cde/lib/tt/lib/api/c/api_filemap.C
+++ b/cde/lib/tt/lib/api/c/api_filemap.C
@@ -170,10 +170,6 @@ _tt_host_file_netfile(const char * host, const char * filename)
        _Tt_host_equiv_ptr eq_p = new _Tt_host_equiv;
 
        if (eq_p->hostname_equiv(hostname, local_host) == 1) {
-#ifdef notdef
-printf("DEBUG _tt_host_file_netfile: resolving locally.\n");
-#endif
-
                // strdup already done in _tt_netfile_file()
                return _tt_file_netfile(filename);
        }
@@ -234,10 +230,6 @@ _tt_host_netfile_file(const char * host, const char * netfilename)
        _Tt_host_equiv_ptr      eq_p = new _Tt_host_equiv;
 
        if (eq_p->hostname_equiv(hostname, local_host) == 1) {
-#ifdef notdef
-printf("DEBUG _tt_host_netfile_file: resolving locally.\n");
-#endif
-
                // strdup already done in _tt_netfile_file()
                 return _tt_netfile_file(netfilename);
         }
@@ -385,11 +377,6 @@ set_filename(const _Tt_string & filename)
        // Now get the network path of the file.
        tmp_string = _tt_local_network_path(absolute_path);
 
-#ifdef notdef
-printf("DEBUG set_filename: _tt_local_network_path(%s) returned %s\n",
-       (char *) absolute_path, (char *) tmp_string);
-#endif
-
        _lpath = absolute_path; // what we know the file as.
 
        // load hostname and rpath simultaneously
@@ -409,10 +396,6 @@ printf("DEBUG set_filename: _tt_local_network_path(%s) returned %s\n",
 
        _canonical_path = _canonical_path.cat(_hostname).cat(_rpath).cat(_lpath);
 
-#ifdef notdef
-printf("DEBUG set_filename: _canonical_path == %s\n", (char *) _canonical_path);
-#endif
-
        return _canonical_path;
 }
 
@@ -465,27 +448,14 @@ parse_netfilename(const _Tt_string & canonical_name)
 
        _canonical_path = canonical_name;
 
-#ifdef notdef
-       printf("DEBUG parse_netfilename: _canonical_path == %s\n", (char *) _canonical_path);
-#endif
-
        tmp_string = _canonical_path.split(':', dummy);
 
        _hostname = tmp_string.mid(h_begin, h_end - h_begin + 1);
 
        _rpath = tmp_string.mid(r_begin, r_end - r_begin + 1);
 
-#ifdef notdef
-       printf("DEBUG parse_netfilename: _rpath == %s\n", (char *) _rpath);
-#endif
-
        _lpath = tmp_string.mid(l_begin, l_end - l_begin + 1);
 
-#ifdef notdef
-       printf("DEBUG parse_netfilename: _lpath == %s\n", (char *) _lpath);
-#endif
-
-
        return _canonical_path;
 }
 

diff --git a/cde/lib/tt/lib/db/tt_db_client.C b/cde/lib/tt/lib/db/tt_db_client.C
index 70303fce268ba94df62b7bdca0a310c5a66e11f9..f6f3812a8f02097c276808210e53cbaa0dcafbed 100644 (file)
--- a/cde/lib/tt/lib/db/tt_db_client.C
+++ b/cde/lib/tt/lib/db/tt_db_client.C
@@ -303,11 +303,6 @@ _Tt_db_results _Tt_db_client::connectToDB (const _Tt_string &hostname)
 void _Tt_db_client::
 SetError(enum clnt_stat cf_stat)
 {
-
-#ifdef  notdef
-printf("DEBUG _Tt_db_client::SetError() -- cf_stat == %d\n", cf_stat);
-#endif  /* notdef */
-       
        switch (cf_stat) {
                case RPC_PROGNOTREGISTERED:
                case RPC_AUTHERROR:

diff --git a/cde/lib/tt/lib/util/tt_file_system.C b/cde/lib/tt/lib/util/tt_file_system.C
index e30c73d795683a97398cf137d2bcd1b53fbdebe9..7973315cb70be9ba5c5604d534c8db5350c769e6 100644 (file)
--- a/cde/lib/tt/lib/util/tt_file_system.C
+++ b/cde/lib/tt/lib/util/tt_file_system.C
@@ -371,29 +371,14 @@ findMountEntry (const _Tt_string &network_path)
        while (entries_cursor.next()) {
                current_hostname = entries_cursor->getHostname();
 
-#ifdef notdef
-printf("DEBUG findMountEntry: hostname = %s, current_hostname = %s\n",
-       (char *) hostname, (char *) current_hostname);
-#endif
-
                if (eq_p->hostname_equiv(hostname, current_hostname) == 1) {
                        current_partition = entries_cursor->getPartition();
                        current_partition_length = current_partition.len();
 
-#ifdef notdef
-printf("DEBUG findMountEntry: found hostname equivalence between %s and %s\n",
-       (char *) hostname, (char *) current_hostname);
-#endif
-
                        if (path_length >= current_partition_length) {
                                if (!memcmp((char *)path, (char *)current_partition,
                                            current_partition_length)) {
                                        entry = *entries_cursor;
-#ifdef notdef
-printf("DEBUG findMountEntry: found PATH equivalence between %s and %s\n",
-       (char *) hostname, (char *) current_hostname);
-#endif
-
                                        break;
                                }
                        }

diff --git a/cde/lib/tt/lib/util/tt_host_equiv.C b/cde/lib/tt/lib/util/tt_host_equiv.C
index b0eac0da5340afc76e6205e4672f32b17249bd27..9778fa340cfcb96fd32c14374f59b42c86c4d636 100644 (file)
--- a/cde/lib/tt/lib/util/tt_host_equiv.C
+++ b/cde/lib/tt/lib/util/tt_host_equiv.C
@@ -108,11 +108,6 @@ prefix_host(const _Tt_string & host, const _Tt_string & localhost)
        _Tt_string h_prefix = host, l_prefix = localhost,
                   h, l, rpart_host, rpart_localhost;
 
-#ifdef notdef
-printf("DEBUG prefix_host: host = %s, localhost = %s\n",
-       (char *) host, (char *) localhost);
-#endif
-
        while (rpart_host == rpart_localhost) {
                h = h_prefix;
                l = l_prefix;
@@ -126,9 +121,6 @@ printf("DEBUG prefix_host: host = %s, localhost = %s\n",
                rpart_localhost = l.split(j, l_prefix);
        }
 
-#ifdef notdef
-printf("DEBUG prefix_host: returning %s\n", (char *) h);
-#endif
        return h;
 }
 
@@ -142,9 +134,6 @@ hostname_equiv(const _Tt_string & host1, const _Tt_string & host2)
 {
         // First try a simple comparison.
         if (host1 == host2) {
-#ifdef notdef
-printf("DEBUG hostname_equiv: host1 == host2, returning 1\n");
-#endif
                 return 1;
         }
 
@@ -194,10 +183,6 @@ printf("DEBUG hostname_equiv: host1 == host2, returning 1\n");
                        // so do just one comparison.
 
                        if (short_tmp != long_prefix) {
-#ifdef notdef
-printf("DEBUG hostname_equiv: short_tmp %s != long_prefix %s, returning 0\n",
-       (char *) short_tmp, (char *) long_prefix);
-#endif
                                return 0;
                        }
                        is_found = 1;
@@ -205,18 +190,11 @@ printf("DEBUG hostname_equiv: short_tmp %s != long_prefix %s, returning 0\n",
                }
 
                if (short_prefix != long_prefix) {
-#ifdef notdef
-printf("DEBUG hostname_equiv: short_prefix %s != long_prefix %s, returning 0\n",
-       (char *) short_prefix, (char *) long_prefix);
-#endif
                        return 0;
                }
        }
 
        if (is_found != 1) {
-#ifdef notdef
-printf("DEBUG hostname_equiv: is_found != 1, returning 0\n");
-#endif
                return 0;       // no prefix was found
        }
 
@@ -239,9 +217,6 @@ printf("DEBUG hostname_equiv: is_found != 1, returning 0\n");
                if (_cache_it(sh, shorthost) == 1) {
                        _cache_table->insert(sh);
                } else {
-#ifdef notdef
-printf("DEBUG hostname_equiv: sh.is_null(): returning 0\n");
-#endif
                        return 0;
                }
        }
@@ -253,9 +228,6 @@ printf("DEBUG hostname_equiv: sh.is_null(): returning 0\n");
                if (_cache_it(lh, longhost) == 1) {
                        _cache_table->insert(lh);
                } else {
-#ifdef notdef
-printf("DEBUG hostname_equiv: lh.is_null(): returning 0\n");
-#endif
                        return 0;
                }
        }
@@ -266,10 +238,6 @@ printf("DEBUG hostname_equiv: lh.is_null(): returning 0\n");
        // This will probably never happen but why
        // not be careful?
        if (sh->addr_length != lh->addr_length) {
-#ifdef notdef
-printf("DEBUG hostname_equiv: sh->addr_length %d != h->addr_length %d, returning 0\n",
-       sh->addr_length, lh->addr_length);
-#endif
                return 0;
        }
 
@@ -278,17 +246,10 @@ printf("DEBUG hostname_equiv: sh->addr_length %d != h->addr_length %d, returning
 
         while (sh_c.next()) {
                while (lh_c.next()) {
-#ifdef notdef
-printf("DEBUG hostname_equiv: checking address at 0x%x w/ 0x%x\n", 
-       (char *) *sh_c, (char *) *lh_c);
-#endif
                        // Do the IP addresses match?
                        if (memcmp((char *) *sh_c, (char *) *lh_c,
                                    sh->addr_length) == 0) {
                                // success!
-#ifdef notdef
-printf("DEBUG hostname_equiv: found match!\n");
-#endif
                                return 1;
                        }
                 }

diff --git a/cde/lib/tt/lib/util/tt_path.C b/cde/lib/tt/lib/util/tt_path.C
index 6aebf77f5b01d451e456273e79f59ffa7c30c4d0..7cc309c0d0b32170737007471ce9525e70c3e03d 100644 (file)
--- a/cde/lib/tt/lib/util/tt_path.C
+++ b/cde/lib/tt/lib/util/tt_path.C
@@ -258,90 +258,42 @@ _Tt_string _tt_local_network_path(const _Tt_string &path)
 
        if (path.len()) {
                _Tt_string real_path = _tt_realpath(path);
-#ifdef notdef
-printf("DEBUG _tt_local_network_path: real_path initialized to %s\n",
-       (char *) real_path);
-#endif
                _Tt_file_system file_system;
                _Tt_file_system_entry_ptr entry =
                        file_system.bestMatchToPath(real_path);
 
                _Tt_string hostname = entry->getHostname();
-#ifdef notdef
-printf("DEBUG _tt_local_network_path: hostname = %s\n",
-       (char *) hostname);
-#endif
                _Tt_string loop_back_mount_point =
                                entry->getLoopBackMountPoint();
-#ifdef notdef
-printf("DEBUG _tt_local_network_path: loop_back_mount_point = %s\n",
-       (char *) loop_back_mount_point == NULL ? "(null)" : (char *) loop_back_mount_point);
-#endif
                _Tt_string mount_point;
                if (loop_back_mount_point.len() > 0) {
                        mount_point = loop_back_mount_point;
-#ifdef notdef
-printf("DEBUG _tt_local_network_path: ! isLocal 1: mount_point = %s\n",
-       (char *) mount_point);
-#endif
                } else {
                        mount_point = entry->getMountPoint();
-#ifdef notdef
-printf("DEBUG _tt_local_network_path: ! isLocal 2: mount_point = %s\n",
-       (char *) mount_point);
-#endif
                }
 
                if (entry->isLocal()) {
                        if (loop_back_mount_point.len() > 0) {
-#ifdef notdef
-printf("DEBUG _tt_local_network_path: isLocal 2: mount_point = %s\n",
-       (char *) mount_point);
-#endif
                                // Get the path info after the loop back
                                // mount point path.
                                real_path = real_path.right(real_path.len() -
                                                            mount_point.len());
-#ifdef notdef
-printf("DEBUG _tt_local_network_path: isLocal 2: real_path = %s\n",
-       (char *) real_path);
-#endif
                                // Replace the loop back mount point path
                                // with the mount point path.
                                if (mount_point != "/") {
                                        real_path = mount_point.cat(real_path);
                                }
-#ifdef notdef
-printf("DEBUG _tt_local_network_path: isLocal 3: real_path = %s\n",
-       (char *) real_path);
-#endif
                        }
                } else {
                        _Tt_string partition = entry->getPartition();
-#ifdef notdef
-printf("DEBUG _tt_local_network_path: ! isLocal: partition = %s\n",
-       (char *) partition);
-#endif
                        // Get the path info after the mount point path
                        real_path =
                        real_path.right(real_path.len()-mount_point.len());
-#ifdef notdef
-printf("DEBUG _tt_local_network_path: ! isLocal: real_path = %s\n",
-       (char *) real_path);
-#endif
                        // Replace the mount point path with the exported
                        // partition path.
                        real_path = partition.cat(real_path);
-#ifdef notdef
-printf("DEBUG _tt_local_network_path: ! isLocal: real_path = %s\n",
-       (char *) real_path);
-#endif
                }
                network_path = hostname.cat(":").cat(real_path);
-#ifdef notdef
-printf("DEBUG _tt_local_network_path: network_path = %s\n",
-       (char *) network_path);
-#endif
        }
 
        return network_path;

diff --git a/cde/programs/dtcm/dtcm/calendarA.c b/cde/programs/dtcm/dtcm/calendarA.c
index c588ff4cf601c3f4f7176740240dbe3323552126..6f079daeee91ace6faddc47209d8ad1a52302d44 100644 (file)
--- a/cde/programs/dtcm/dtcm/calendarA.c
+++ b/cde/programs/dtcm/dtcm/calendarA.c
@@ -2916,27 +2916,6 @@ paint_canvas(
        return stat;
 }
 
-#ifdef notdef
-extern char*
-cm_get_relname()
-{
-        char s[BUFSIZ];
-        static char *CM_name;
-
-        /* we now make a composite name for the tool, combining
-         * "Calendar Manager" with a release identifier
-         */
-       if (CM_name == NULL) {
-                sprintf(s, "%s", catgets(calendar->DT_catd, 1, 113, "Calendar"));
-               CM_name = (char*)ckalloc(cm_strlen(s) + 2);
-        
-               sprintf(CM_name, "%s", s);
-       }
- 
-        return (char*)CM_name;
-}
-#endif 
-
 extern Boolean
 in_range(time_t start, time_t stop, time_t tick) {
         if (tick >= start && tick <= stop)

diff --git a/cde/programs/dtlogin/choose.c b/cde/programs/dtlogin/choose.c
index 4d15008abf08e8afe28667e76c40362b86c3719d..ab3cc4dbe3c9f8f159e86949b29e72880b092bf1 100644 (file)
--- a/cde/programs/dtlogin/choose.c
+++ b/cde/programs/dtlogin/choose.c
@@ -324,34 +324,6 @@ RegisterIndirectChoice (
     return 1;
 }
 
-#ifdef notdef
-static void
-RemoveIndirectChoice (clientAddress, connectionType)
-    ARRAY8Ptr  clientAddress;
-    CARD16     connectionType;
-{
-    ChoicePtr  c, prev;
-
-    prev = 0;
-    for (c = choices; c; c = c->next)
-    {
-       if (XdmcpARRAY8Equal (clientAddress, &c->client) &&
-           connectionType == c->connectionType)
-       {
-           if (prev)
-               prev->next = c->next;
-           else
-               choices = c->next;
-           XdmcpDisposeARRAY8 (&c->client);
-           XdmcpDisposeARRAY8 (&c->choice);
-           free ((char *) c);
-           return;
-       }
-       prev = c;
-    }
-}
-#endif
-
 /*ARGSUSED*/
 static void
 AddChooserHost (

diff --git a/cde/programs/dtlogin/xdmauth.c b/cde/programs/dtlogin/xdmauth.c
index 375d53b381cc1349c8eb7110027ea85a706a2db7..585e1f078096fc5eff3ca922ec67670547bf006e 100644 (file)
--- a/cde/programs/dtlogin/xdmauth.c
+++ b/cde/programs/dtlogin/xdmauth.c
@@ -105,15 +105,6 @@ XdmPrintDataHex(const char *s, const char *a, int l)
     Debug ("\n");
 }
 
-#ifdef notdef                  /* not used */
-XdmPrintKey (s, k)
-    char           *s;
-    XdmAuthKeyRec   *k;
-{
-    XdmPrintDataHex (s, (char *) k->data, 8);
-}
-#endif
-
 #ifdef XDMCP
 void
 XdmPrintArray8Hex(const char *s, ARRAY8Ptr a)

diff --git a/cde/programs/dtmail/dtmail/DtMailEditor.C b/cde/programs/dtmail/dtmail/DtMailEditor.C
index 28a2780c5f651ef2b7c7eb3e3d0360762b9a40fb..0c9be1fc85b8e63a50eee513da63a573ff98f652 100644 (file)
--- a/cde/programs/dtmail/dtmail/DtMailEditor.C
+++ b/cde/programs/dtmail/dtmail/DtMailEditor.C
@@ -521,32 +521,6 @@ DtMailEditor::attachDragMotionHandler(
     }
 }
 
-#ifdef notdef
-void
-DtMailEditor::attachDragSetup()
-{
-    Boolean    btn1_transfer;
-    Widget     widget = _myAttachArea->baseWidget();
-
-    DebugPrintf(3, "In DtMailEditor::attachDragSetup()\n");
-
-    XtAddEventHandler(widget, Button1MotionMask, FALSE,
-               (XtEventHandler)&DtMailEditor::attachDragMotionHandler,
-               (XtPointer)this);
-
-    XtVaGetValues(
-       (Widget)XmGetXmDisplay(XtDisplayOfObject(widget)),
-       "enableBtn1Transfer", &btn1_transfer,
-       NULL);
-
-    if (!btn1_transfer) {
-       XtAddEventHandler(widget, Button2MotionMask, FALSE,
-               (XtEventHandler)&DtMailEditor::attachDragMotionHandler,
-               (XtPointer)this);
-    }
-}
-#endif
-
 void
 DtMailEditor::stripCRLF(char **buffer, const char * buf, const unsigned long len)
 {

diff --git a/cde/programs/dtterm/DtTermMain.c b/cde/programs/dtterm/DtTermMain.c
index c5486f2eaf1f72fed02cb8e5f682c3829888c1f6..d6229b5436680f7abcdacdaabd39b7c8e6a1ae6e 100644 (file)
--- a/cde/programs/dtterm/DtTermMain.c
+++ b/cde/programs/dtterm/DtTermMain.c
@@ -431,9 +431,6 @@ DecrementInstanceCountAndExit(Widget w, XtPointer client_data,
 #ifdef TERMINAL_SERVER
     if (attrs.standAlone || !attrs.serverId) {
 #endif /* TERMINAL_SERVER */
-#ifdef notdef
-    if (!attrs.server) {
-#endif /* notdef */
        if (InstanceCount <= 0) {
            /* use a timeout so that the toolkit can finish killing off
             * this widget...
@@ -446,12 +443,6 @@ DecrementInstanceCountAndExit(Widget w, XtPointer client_data,
        ServerInstanceTerminated((Widget) client_data);
     }
 #endif /* TERMINAL_SERVER */
-#ifdef notdef
-    } else {
-       /* Here is where one would add the call into sunDtTermServer.c
-        * implement a "lurking" dtterm server. */
-    }
-#endif /* notdef */
 }
 
 /***************************************************************************

diff --git a/cde/programs/dtwm/README b/cde/programs/dtwm/README
index eb1961fb72136ff1c94dc0edfd5e260900d2fc03..c32f1513ec40a48f17124095fd3fc68afddefb5d 100644 (file)
--- a/cde/programs/dtwm/README
+++ b/cde/programs/dtwm/README
@@ -154,8 +154,3 @@ header file include flags, and macros (e.g. ABS).
     _NO_WM
        Enables testing code in WmPanel.c that allows it to be compiled
        with a test program outside of the window manager.
-
-    notdef
-       Enables more complete resource comparison in WmResource.c which
-       could make resource utilization more optimal. This is currently 
-       turned off to avoid some problems with the pixmap resources.

diff --git a/cde/programs/dtwm/WmResource.c b/cde/programs/dtwm/WmResource.c
index 197ec91111f8740f65ed79e083fc1e8f907b5290..5e6fc5577b372fcf5d4edbd4c335555b0dfbf94d 100644 (file)
--- a/cde/programs/dtwm/WmResource.c
+++ b/cde/programs/dtwm/WmResource.c
@@ -6219,29 +6219,6 @@ Boolean SimilarAppearanceData (AppearanceData *pAD1, AppearanceData *pAD2)
 {
     Boolean rval;
 
-#ifdef notdef
-    if ((pAD1->fontList == pAD2->fontList) &&
-       (pAD1->background == pAD2->background) &&
-       (pAD1->foreground == pAD2->foreground) &&
-       (pAD1->backgroundPStr == pAD2->backgroundPStr) &&
-       (pAD1->backgroundPixmap == pAD2->backgroundPixmap) &&
-       (pAD1->bottomShadowColor == pAD2->bottomShadowColor) &&
-       (pAD1->bottomShadowPStr == pAD2->bottomShadowPStr) &&
-       (pAD1->bottomShadowPixmap == pAD2->bottomShadowPixmap) &&
-       (pAD1->topShadowColor == pAD2->topShadowColor) &&
-       (pAD1->topShadowPStr == pAD2->topShadowPStr) &&
-       (pAD1->topShadowPixmap == pAD2->topShadowPixmap) &&
-       (pAD1->activeBackground == pAD2->activeBackground) &&
-       (pAD1->activeForeground == pAD2->activeForeground) &&
-       (pAD1->activeBackgroundPStr == pAD2->activeBackgroundPStr) &&
-       (pAD1->activeBackgroundPixmap == pAD2->activeBackgroundPixmap) &&
-       (pAD1->activeBottomShadowColor == pAD2->activeBottomShadowColor) &&
-       (pAD1->activeBottomShadowPStr == pAD2->activeBottomShadowPStr) &&
-       (pAD1->activeBottomShadowPixmap == pAD2->activeBottomShadowPixmap) &&
-       (pAD1->activeTopShadowColor == pAD2->activeTopShadowColor) &&
-       (pAD1->activeTopShadowPStr == pAD2->activeTopShadowPStr) &&
-       (pAD1->activeTopShadowPixmap == pAD2->activeTopShadowPixmap) )
-#else
     /*
      * !!! Should find out why all the Pixmap resources are unset !!!
      */
@@ -6261,7 +6238,6 @@ Boolean SimilarAppearanceData (AppearanceData *pAD1, AppearanceData *pAD2)
        (pAD1->activeBottomShadowPStr == pAD2->activeBottomShadowPStr) &&
        (pAD1->activeTopShadowColor == pAD2->activeTopShadowColor) &&
        (pAD1->activeTopShadowPStr == pAD2->activeTopShadowPStr) )
-#endif
     {
        rval = True;
     }