summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/fc/fserve.c47
-rw-r--r--src/fontfile/fontfile.c4
2 files changed, 0 insertions, 51 deletions
diff --git a/src/fc/fserve.c b/src/fc/fserve.c
index eecf17c..abf7d07 100644
--- a/src/fc/fserve.c
+++ b/src/fc/fserve.c
@@ -77,10 +77,6 @@ in this Software without prior written authorization from The Open Group.
#include <time.h>
#define Time_t time_t
-#ifdef NCD
-#include <ncd/nvram.h>
-#endif
-
#include <stddef.h>
#ifndef MIN
@@ -335,10 +331,6 @@ fs_init_fpe(FontPathElementPtr fpe)
if (err == Successful)
{
-#ifdef NCD
- if (configData.ExtendedFontDiags)
- printf("Connected to font server \"%s\"\n", name);
-#endif
#ifdef DEBUG
fprintf (stderr, "connected to FS \"%s\"\n", name);
#endif
@@ -348,10 +340,6 @@ fs_init_fpe(FontPathElementPtr fpe)
#ifdef DEBUG
fprintf(stderr, "failed to connect to FS \"%s\" %d\n", name, err);
#endif
-#ifdef NCD
- if (configData.ExtendedFontDiags)
- printf("Failed to connect to font server \"%s\"\n", name);
-#endif
;
}
return err;
@@ -388,10 +376,6 @@ fs_free_fpe(FontPathElementPtr fpe)
_fs_free_conn (conn);
fpe->private = (pointer) 0;
-#ifdef NCD
- if (configData.ExtendedFontDiags)
- printf("Disconnected from font server \"%s\"\n", fpe->name);
-#endif
#ifdef DEBUG
fprintf (stderr, "disconnect from FS \"%s\"\n", fpe->name);
#endif
@@ -1762,15 +1746,6 @@ fs_send_open_font(pointer client, FontPathElementPtr fpe, Mask flags,
_fs_write(conn, (char *) &extreq, SIZEOF(fsQueryXExtents16Req));
}
-#ifdef NCD
- if (configData.ExtendedFontDiags)
- {
- memcpy(buf, name, MIN(256, namelen));
- buf[MIN(256, namelen)] = '\0';
- printf("Requesting font \"%s\" from font server \"%s\"\n",
- buf, font->fpe->name);
- }
-#endif
_fs_prepare_for_reply (conn);
err = blockrec->errcode;
@@ -2450,17 +2425,6 @@ fs_send_list_fonts(pointer client, FontPathElementPtr fpe, const char *pattern,
blockrec->sequenceNumber = conn->current_seq;
-#ifdef NCD
- if (configData.ExtendedFontDiags) {
- char buf[256];
-
- memcpy(buf, pattern, MIN(256, patlen));
- buf[MIN(256, patlen)] = '\0';
- printf("Listing fonts on pattern \"%s\" from font server \"%s\"\n",
- buf, fpe->name);
- }
-#endif
-
_fs_prepare_for_reply (conn);
return Suspended;
}
@@ -2678,17 +2642,6 @@ fs_start_list_with_info(pointer client, FontPathElementPtr fpe,
blockrec->sequenceNumber = conn->current_seq;
-#ifdef NCD
- if (configData.ExtendedFontDiags) {
- char buf[256];
-
- memcpy(buf, pattern, MIN(256, len));
- buf[MIN(256, len)] = '\0';
- printf("Listing fonts with info on pattern \"%s\" from font server \"%s\"\n",
- buf, fpe->name);
- }
-#endif
-
_fs_prepare_for_reply (conn);
return Successful;
}
diff --git a/src/fontfile/fontfile.c b/src/fontfile/fontfile.c
index 4fb75ad..e16b58e 100644
--- a/src/fontfile/fontfile.c
+++ b/src/fontfile/fontfile.c
@@ -73,7 +73,6 @@ static int FontFileOpenBitmapNCF (FontPathElementPtr fpe, FontPtr *pFont,
int
FontFileNameCheck (const char *name)
{
-#ifndef NCD
#if defined(WIN32)
/* WIN32 uses D:/... as a path name for fonts, so accept this as a valid
* path if it starts with a letter and a colon.
@@ -82,9 +81,6 @@ FontFileNameCheck (const char *name)
return TRUE;
#endif
return *name == '/';
-#else
- return ((strcmp(name, "built-ins") == 0) || (*name == '/'));
-#endif
}
int