CVS commit: xsrc/external/mit/twm/dist/src
Module Name:xsrc
Committed By: christos
Date: Tue Sep 22 18:33:41 UTC 2015
Modified Files:
xsrc/external/mit/twm/dist/src: util.c util.h
Log Message:
constify to fix build (with minimal changes)
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/twm/dist/src/util.c
cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/external/mit/twm/dist/src/util.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/twm/dist/src/util.c
diff -u xsrc/external/mit/twm/dist/src/util.c:1.2 xsrc/external/mit/twm/dist/src/util.c:1.3
--- xsrc/external/mit/twm/dist/src/util.c:1.2 Wed Oct 1 05:56:39 2014
+++ xsrc/external/mit/twm/dist/src/util.c Tue Sep 22 14:33:41 2015
@@ -256,11 +256,11 @@ Zoom(Window wf, Window wt)
* \param name the filename to expand
*/
char *
-ExpandFilename(char *name)
+ExpandFilename(const char *name)
{
char *newname;
-if (name[0] != '~') return name;
+if (name[0] != '~') return strdup(name);
newname = malloc (HomeLen + strlen(name) + 2);
if (!newname) {
Index: xsrc/external/mit/twm/dist/src/util.h
diff -u xsrc/external/mit/twm/dist/src/util.h:1.1.1.4 xsrc/external/mit/twm/dist/src/util.h:1.2
--- xsrc/external/mit/twm/dist/src/util.h:1.1.1.4 Mon Mar 17 04:48:43 2014
+++ xsrc/external/mit/twm/dist/src/util.h Tue Sep 22 14:33:41 2015
@@ -64,7 +64,7 @@ in this Software without prior written a
extern void MoveOutline ( Window root, int x, int y, int width, int height,
int bw, int th );
extern void Zoom ( Window wf, Window wt );
-extern char * ExpandFilename ( char *name );
+extern char * ExpandFilename ( const char *name );
extern void GetUnknownIcon ( const char *name );
extern Pixmap FindBitmap ( const char *name, unsigned int *widthp,
unsigned int *heightp );
CVS commit: xsrc/external/mit/twm/dist/src
Module Name:xsrc
Committed By: mlelstv
Date: Wed Oct 1 09:56:39 UTC 2014
Modified Files:
xsrc/external/mit/twm/dist/src: util.c
Log Message:
do not try to extend the font-pattern with a wild-card. This will almost
always select the wrong fontset and use wrong metrics.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/external/mit/twm/dist/src/util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/twm/dist/src/util.c
diff -u xsrc/external/mit/twm/dist/src/util.c:1.1.1.4 xsrc/external/mit/twm/dist/src/util.c:1.2
--- xsrc/external/mit/twm/dist/src/util.c:1.1.1.4 Mon Mar 17 08:48:43 2014
+++ xsrc/external/mit/twm/dist/src/util.c Wed Oct 1 09:56:39 2014
@@ -589,17 +589,13 @@ GetFont(MyFont *font)
int ascent;
int descent;
int fnum;
-char *basename2;
if (use_fontset) {
if (font-fontset != NULL){
XFreeFontSet(dpy, font-fontset);
}
- basename2 = malloc(strlen(font-name) + 3);
- if (basename2) sprintf(basename2, %s,*, font-name);
- else basename2 = font-name;
- if( (font-fontset = XCreateFontSet(dpy, basename2,
+ if( (font-fontset = XCreateFontSet(dpy, font-name,
missing_charset_list_return,
missing_charset_count_return,
def_string_return)) == NULL) {
@@ -607,7 +603,6 @@ GetFont(MyFont *font)
ProgramName, font-name);
exit(1);
}
- if (basename2 != font-name) free(basename2);
for(i=0; imissing_charset_count_return; i++){
printf(%s: warning: font for charset %s is lacking.\n,
ProgramName, missing_charset_list_return[i]);
CVS commit: xsrc/external/mit/twm/dist
Module Name:xsrc Committed By: mrg Date: Wed Aug 3 02:44:36 UTC 2011 Update of /cvsroot/xsrc/external/mit/twm/dist In directory ivanova.netbsd.org:/tmp/cvs-serv27499 Log Message: initial import of twm-1.0.7 Status: Vendor Tag: xorg Release Tags: twm-1-0-7 U xsrc/external/mit/twm/dist/INSTALL U xsrc/external/mit/twm/dist/config.h.in U xsrc/external/mit/twm/dist/configure U xsrc/external/mit/twm/dist/ChangeLog U xsrc/external/mit/twm/dist/depcomp U xsrc/external/mit/twm/dist/missing U xsrc/external/mit/twm/dist/config.sub U xsrc/external/mit/twm/dist/config.guess U xsrc/external/mit/twm/dist/ylwrap U xsrc/external/mit/twm/dist/COPYING U xsrc/external/mit/twm/dist/install-sh U xsrc/external/mit/twm/dist/README U xsrc/external/mit/twm/dist/aclocal.m4 U xsrc/external/mit/twm/dist/Makefile.in U xsrc/external/mit/twm/dist/configure.ac U xsrc/external/mit/twm/dist/Makefile.am U xsrc/external/mit/twm/dist/man/Makefile.in U xsrc/external/mit/twm/dist/man/Makefile.am U xsrc/external/mit/twm/dist/man/twm.man U xsrc/external/mit/twm/dist/src/siconify.bm U xsrc/external/mit/twm/dist/src/resize.h U xsrc/external/mit/twm/dist/src/gc.h U xsrc/external/mit/twm/dist/src/iconmgr.h U xsrc/external/mit/twm/dist/src/parse.h U xsrc/external/mit/twm/dist/src/version.h U xsrc/external/mit/twm/dist/src/screen.h U xsrc/external/mit/twm/dist/src/menus.c U xsrc/external/mit/twm/dist/src/gram.c U xsrc/external/mit/twm/dist/src/events.c U xsrc/external/mit/twm/dist/src/add_window.c U xsrc/external/mit/twm/dist/src/icons.h U xsrc/external/mit/twm/dist/src/cursor.c U xsrc/external/mit/twm/dist/src/util.c U xsrc/external/mit/twm/dist/src/session.h U xsrc/external/mit/twm/dist/src/list.c U xsrc/external/mit/twm/dist/src/twm.h U xsrc/external/mit/twm/dist/src/gram.y U xsrc/external/mit/twm/dist/src/lex.c U xsrc/external/mit/twm/dist/src/add_window.h U xsrc/external/mit/twm/dist/src/util.h U xsrc/external/mit/twm/dist/src/Makefile.am U xsrc/external/mit/twm/dist/src/version.c U xsrc/external/mit/twm/dist/src/gram.h U xsrc/external/mit/twm/dist/src/events.h U xsrc/external/mit/twm/dist/src/icons.c U xsrc/external/mit/twm/dist/src/iconmgr.c U xsrc/external/mit/twm/dist/src/lex.l U xsrc/external/mit/twm/dist/src/deftwmrc.sed U xsrc/external/mit/twm/dist/src/menus.h U xsrc/external/mit/twm/dist/src/resize.c U xsrc/external/mit/twm/dist/src/gc.c U xsrc/external/mit/twm/dist/src/parse.c U xsrc/external/mit/twm/dist/src/Makefile.in U xsrc/external/mit/twm/dist/src/system.twmrc U xsrc/external/mit/twm/dist/src/session.c U xsrc/external/mit/twm/dist/src/deftwmrc.c U xsrc/external/mit/twm/dist/src/list.h U xsrc/external/mit/twm/dist/src/twm.c U xsrc/external/mit/twm/dist/sample-twmrc/jim.twmrc U xsrc/external/mit/twm/dist/sample-twmrc/keith.twmrc U xsrc/external/mit/twm/dist/sample-twmrc/lemke.twmrc No conflicts created by this import
CVS commit: xsrc/external/mit/twm/dist
Module Name:xsrc Committed By: mrg Date: Mon Feb 21 04:23:35 UTC 2011 Update of /cvsroot/xsrc/external/mit/twm/dist In directory ivanova.netbsd.org:/tmp/cvs-serv6384 Log Message: initial import of twm-1.0.6 Status: Vendor Tag: xorg Release Tags: twm-1-0-6 U xsrc/external/mit/twm/dist/install-sh U xsrc/external/mit/twm/dist/COPYING U xsrc/external/mit/twm/dist/ylwrap U xsrc/external/mit/twm/dist/depcomp U xsrc/external/mit/twm/dist/ChangeLog U xsrc/external/mit/twm/dist/aclocal.m4 U xsrc/external/mit/twm/dist/configure U xsrc/external/mit/twm/dist/config.h.in U xsrc/external/mit/twm/dist/missing U xsrc/external/mit/twm/dist/INSTALL U xsrc/external/mit/twm/dist/configure.ac U xsrc/external/mit/twm/dist/config.guess U xsrc/external/mit/twm/dist/Makefile.am U xsrc/external/mit/twm/dist/Makefile.in U xsrc/external/mit/twm/dist/README U xsrc/external/mit/twm/dist/config.sub U xsrc/external/mit/twm/dist/src/deftwmrc.c U xsrc/external/mit/twm/dist/src/iconmgr.c U xsrc/external/mit/twm/dist/src/icons.c U xsrc/external/mit/twm/dist/src/deftwmrc.sed U xsrc/external/mit/twm/dist/src/Makefile.in U xsrc/external/mit/twm/dist/src/parse.c U xsrc/external/mit/twm/dist/src/list.c U xsrc/external/mit/twm/dist/src/add_window.h U xsrc/external/mit/twm/dist/src/gram.y U xsrc/external/mit/twm/dist/src/gc.h U xsrc/external/mit/twm/dist/src/menus.h U xsrc/external/mit/twm/dist/src/version.c U xsrc/external/mit/twm/dist/src/twm.c U xsrc/external/mit/twm/dist/src/Makefile.am U xsrc/external/mit/twm/dist/src/gram.c U xsrc/external/mit/twm/dist/src/util.c U xsrc/external/mit/twm/dist/src/events.h U xsrc/external/mit/twm/dist/src/lex.l U xsrc/external/mit/twm/dist/src/system.twmrc U xsrc/external/mit/twm/dist/src/session.c U xsrc/external/mit/twm/dist/src/resize.c U xsrc/external/mit/twm/dist/src/add_window.c U xsrc/external/mit/twm/dist/src/gc.c U xsrc/external/mit/twm/dist/src/menus.c U xsrc/external/mit/twm/dist/src/version.h U xsrc/external/mit/twm/dist/src/twm.h U xsrc/external/mit/twm/dist/src/parse.h U xsrc/external/mit/twm/dist/src/list.h U xsrc/external/mit/twm/dist/src/lex.c U xsrc/external/mit/twm/dist/src/iconmgr.h U xsrc/external/mit/twm/dist/src/icons.h U xsrc/external/mit/twm/dist/src/session.h U xsrc/external/mit/twm/dist/src/resize.h U xsrc/external/mit/twm/dist/src/siconify.bm U xsrc/external/mit/twm/dist/src/screen.h U xsrc/external/mit/twm/dist/src/util.h U xsrc/external/mit/twm/dist/src/events.c U xsrc/external/mit/twm/dist/src/gram.h U xsrc/external/mit/twm/dist/src/cursor.c U xsrc/external/mit/twm/dist/sample-twmrc/keith.twmrc U xsrc/external/mit/twm/dist/sample-twmrc/jim.twmrc U xsrc/external/mit/twm/dist/sample-twmrc/lemke.twmrc U xsrc/external/mit/twm/dist/man/Makefile.am U xsrc/external/mit/twm/dist/man/twm.man U xsrc/external/mit/twm/dist/man/Makefile.in No conflicts created by this import
CVS commit: xsrc/external/mit/twm/dist
Module Name:xsrc Committed By: mrg Date: Sun Nov 21 02:14:39 UTC 2010 Update of /cvsroot/xsrc/external/mit/twm/dist In directory ivanova.netbsd.org:/tmp/cvs-serv29097 Log Message: initial import of twm-1.0.5 Status: Vendor Tag: xorg Release Tags: twm-1-0-5 U xsrc/external/mit/twm/dist/README U xsrc/external/mit/twm/dist/configure.ac U xsrc/external/mit/twm/dist/INSTALL U xsrc/external/mit/twm/dist/config.h.in U xsrc/external/mit/twm/dist/configure U xsrc/external/mit/twm/dist/aclocal.m4 U xsrc/external/mit/twm/dist/install-sh U xsrc/external/mit/twm/dist/ChangeLog U xsrc/external/mit/twm/dist/Makefile.in U xsrc/external/mit/twm/dist/COPYING U xsrc/external/mit/twm/dist/Makefile.am U xsrc/external/mit/twm/dist/ylwrap U xsrc/external/mit/twm/dist/depcomp U xsrc/external/mit/twm/dist/missing U xsrc/external/mit/twm/dist/config.sub U xsrc/external/mit/twm/dist/config.guess U xsrc/external/mit/twm/dist/man/Makefile.am U xsrc/external/mit/twm/dist/man/Makefile.in U xsrc/external/mit/twm/dist/man/twm.man U xsrc/external/mit/twm/dist/sample-twmrc/lemke.twmrc U xsrc/external/mit/twm/dist/sample-twmrc/jim.twmrc U xsrc/external/mit/twm/dist/sample-twmrc/keith.twmrc U xsrc/external/mit/twm/dist/src/session.c U xsrc/external/mit/twm/dist/src/resize.c U xsrc/external/mit/twm/dist/src/deftwmrc.sed U xsrc/external/mit/twm/dist/src/Makefile.am U xsrc/external/mit/twm/dist/src/events.h U xsrc/external/mit/twm/dist/src/gram.c U xsrc/external/mit/twm/dist/src/add_window.h U xsrc/external/mit/twm/dist/src/lex.l U xsrc/external/mit/twm/dist/src/util.c U xsrc/external/mit/twm/dist/src/gc.c U xsrc/external/mit/twm/dist/src/Makefile.in U xsrc/external/mit/twm/dist/src/list.c U xsrc/external/mit/twm/dist/src/version.c C xsrc/external/mit/twm/dist/src/deftwmrc.c U xsrc/external/mit/twm/dist/src/icons.c U xsrc/external/mit/twm/dist/src/gram.y U xsrc/external/mit/twm/dist/src/twm.c U xsrc/external/mit/twm/dist/src/parse.c U xsrc/external/mit/twm/dist/src/system.twmrc U xsrc/external/mit/twm/dist/src/menus.h U xsrc/external/mit/twm/dist/src/iconmgr.c U xsrc/external/mit/twm/dist/src/cursor.c U xsrc/external/mit/twm/dist/src/add_window.c U xsrc/external/mit/twm/dist/src/siconify.bm U xsrc/external/mit/twm/dist/src/util.h U xsrc/external/mit/twm/dist/src/gc.h U xsrc/external/mit/twm/dist/src/events.c U xsrc/external/mit/twm/dist/src/gram.h U xsrc/external/mit/twm/dist/src/screen.h U xsrc/external/mit/twm/dist/src/session.h U xsrc/external/mit/twm/dist/src/resize.h U xsrc/external/mit/twm/dist/src/menus.c U xsrc/external/mit/twm/dist/src/iconmgr.h U xsrc/external/mit/twm/dist/src/twm.h U xsrc/external/mit/twm/dist/src/parse.h U xsrc/external/mit/twm/dist/src/list.h U xsrc/external/mit/twm/dist/src/version.h U xsrc/external/mit/twm/dist/src/icons.h U xsrc/external/mit/twm/dist/src/lex.c 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/twm/dist
