diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-08-01 19:50:43 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-08-01 19:50:43 +0000 |
| commit | 8b679f88150c4c2eecfdb1f5ae1f5930b5aad8f1 (patch) | |
| tree | adacd58b350b261e00251a56227319a03d4291c6 | |
| parent | 49e608432755dbee3b5e63593d3d88c4e2f90834 (diff) | |
| download | ATCD-8b679f88150c4c2eecfdb1f5ae1f5930b5aad8f1.tar.gz | |
ChangeLogTag:Wed Aug 1 12:43:57 2001 Ossama Othman <ossama@uci.edu>
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 8 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 8 | ||||
| -rw-r--r-- | ace/Svc_Conf_l.cpp | 4 |
4 files changed, 26 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 31f364ca6ec..3325830769a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Wed Aug 1 12:43:57 2001 Ossama Othman <ossama@uci.edu> + + * ace/Svc_Conf_l.cpp: + + Reintegreated Nanbor's change (Wed Jun 13 10:22:10 2001 Nanbor + Wang <nanbor@cs.wustl.edu>) that enables proper handling of + UNICODE Service Configurator directives. + Wed Aug 1 07:14:42 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> * include/makeinclude/platform_vxworks5.x_g++.GNU: Checked in a new diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 31f364ca6ec..3325830769a 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,11 @@ +Wed Aug 1 12:43:57 2001 Ossama Othman <ossama@uci.edu> + + * ace/Svc_Conf_l.cpp: + + Reintegreated Nanbor's change (Wed Jun 13 10:22:10 2001 Nanbor + Wang <nanbor@cs.wustl.edu>) that enables proper handling of + UNICODE Service Configurator directives. + Wed Aug 1 07:14:42 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> * include/makeinclude/platform_vxworks5.x_g++.GNU: Checked in a new diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 31f364ca6ec..3325830769a 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,11 @@ +Wed Aug 1 12:43:57 2001 Ossama Othman <ossama@uci.edu> + + * ace/Svc_Conf_l.cpp: + + Reintegreated Nanbor's change (Wed Jun 13 10:22:10 2001 Nanbor + Wang <nanbor@cs.wustl.edu>) that enables proper handling of + UNICODE Service Configurator directives. + Wed Aug 1 07:14:42 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> * include/makeinclude/platform_vxworks5.x_g++.GNU: Checked in a new diff --git a/ace/Svc_Conf_l.cpp b/ace/Svc_Conf_l.cpp index f4568e21d2b..8c572fa8acc 100644 --- a/ace/Svc_Conf_l.cpp +++ b/ace/Svc_Conf_l.cpp @@ -1161,8 +1161,8 @@ ACE_LIB_TEXT ("input buffer overflow, can't enlarge buffer because scanner uses #endif } - if ( num_to_read > ACE_YY_READ_BUF_SIZE ) - num_to_read = ACE_YY_READ_BUF_SIZE; + if ( num_to_read * sizeof (ACE_TCHAR) > ACE_YY_READ_BUF_SIZE ) + num_to_read = ACE_YY_READ_BUF_SIZE / sizeof (ACE_TCHAR); /* Read in more data. */ ACE_YY_INPUT( (&ace_yy_current_buffer->ace_yy_ch_buf[number_to_move]), |