[PATCH:libX11 3/8] ifdef out code that truncates the source length to the destination length if it is larger. Seems useless to do that since the code tests for both source length and destination to be non-zero. This fixes cut-n-paste problem in xterm where the paste length was limited to 1024 (BUFSIZ) in button.c

Thomas Klausner wiz at NetBSD.org
Sun Jun 2 16:18:43 PDT 2013


On Sun, Jun 02, 2013 at 04:15:55PM -0700, Alan Coopersmith wrote:
> Style tip: the first line of a commit message should be a short summary
> that fits into an 80 column screen - that's what git shows as the commit
> title and the changelog message that goes into new release announcements,
> as well as the subject line of git format-patch output (as you can see,
> this patch has a subject line that's too long to read in most mail clients).

Ok. I'll do that in the future.

> Is there any point in ifdef'ing these out vs. removing them as commit
> 002b36e308a26a1 did for one already?

Actually, no. I'll send an updated patch.

> In any case, I don't think this is a release blocker for 1.6, so should
> wait until after that release is made.

Fine with me, as long as it doesn't get lost :)
 Thomas

> 
> 	-alan-
> 
> 
> On 06/ 2/13 11:49 AM, Thomas Klausner wrote:
> >---
> >  modules/lc/gen/lcGenConv.c | 18 ++++++++++++++++++
> >  1 file changed, 18 insertions(+)
> >
> >diff --git a/modules/lc/gen/lcGenConv.c b/modules/lc/gen/lcGenConv.c
> >index 42d63c5..5a4fd64 100644
> >--- a/modules/lc/gen/lcGenConv.c
> >+++ b/modules/lc/gen/lcGenConv.c
> >@@ -764,8 +764,10 @@ mbstowcs_org(
> >          return( 0 );
> >      }
> >
> >+#ifdef notdef
> >      if (*from_left > *to_left)
> >          *from_left = *to_left;
> >+#endif
> >
> >      while (*from_left && *to_left) {
> >
> >@@ -921,8 +923,10 @@ wcstombs_org(
> >      int defstr_len = strlen(default_string);
> >
> >
> >+#ifdef notdef
> >      if (*from_left > *to_left)
> >          *from_left = *to_left;
> >+#endif
> >
> >      while (*from_left && *to_left) {
> >
> >@@ -1080,8 +1084,10 @@ wcstocts(
> >      int from_size = *from_left;
> >      char *ext_seg_len = NULL;
> >
> >+#ifdef notdef
> >      if (*from_left > *to_left)
> >          *from_left = *to_left;
> >+#endif
> >
> >      while (*from_left && *to_left) {
> >
> >@@ -1272,8 +1278,10 @@ ctstowcs(
> >          return( 0 );
> >      }
> >
> >+#ifdef notdef
> >      if (*from_left > *to_left)
> >          *from_left = *to_left;
> >+#endif
> >
> >      while (*from_left && *to_left) {
> >
> >@@ -1666,8 +1674,10 @@ mbstostr(
> >          return( 0 );
> >      }
> >
> >+#ifdef notdef
> >      if (*from_left > *to_left)
> >          *from_left = *to_left;
> >+#endif
> >
> >      while (*from_left && *to_left) {
> >
> >@@ -1957,8 +1967,10 @@ wcstostr(
> >      int defstr_len = strlen(default_string);
> >
> >
> >+#ifdef notdef
> >      if (*from_left > *to_left)
> >          *from_left = *to_left;
> >+#endif
> >
> >      while (*from_left && *to_left) {
> >
> >@@ -2114,8 +2126,10 @@ wctocs(
> >      char *outbufptr = *to;
> >      int from_size = *from_left;
> >
> >+#ifdef notdef
> >      if (*from_left > *to_left)
> >          *from_left = *to_left;
> >+#endif
> >
> >      if (*from_left && *to_left) {
> >
> >@@ -2427,8 +2441,10 @@ strtombs(
> >      char *outbufptr = *to;
> >      int from_size = *from_left;
> >
> >+#ifdef notdef
> >      if (*from_left > *to_left)
> >          *from_left = *to_left;
> >+#endif
> >
> >      while (*from_left && *to_left) {
> >
> >@@ -2537,8 +2553,10 @@ strtowcs(
> >      wchar_t *outbufptr = (wchar_t *)*to;
> >      int from_size = *from_left;
> >
> >+#ifdef notdef
> >      if (*from_left > *to_left)
> >          *from_left = *to_left;
> >+#endif
> >
> >      while (*from_left && *to_left) {
> >
> >
> 
> 
> -- 
> 	-Alan Coopersmith-              alan.coopersmith at oracle.com
> 	 Oracle Solaris Engineering - http://blogs.oracle.com/alanc


More information about the xorg-devel mailing list