← Back to branch summary

~ubuntu-branches/ubuntu/maverick/speech-tools/maverick

« back to all changes in this revision

Viewing changes to speech_class/EST_wave_io.cc

  • Committer: Bazaar Package Importer
  • Author(s): Kumar Appaiah, Kartik Mistry, Kumar Appaiah
  • Date: 2010-07-17 11:32:04 UTC
  • mfrom: (3.1.6 sid)
  • Revision ID: james.westby@ubuntu.com-20100717113204-mnse3jo236j107q8
Tags: 1:2.0.95~beta-1
[ Kartik Mistry ]
* debian/control:
  + [Lintian] Added missing ${misc:Depends}
  + Updated Standards-Version to 3.8.4 (no changes needed)
* debian/patches/const_char.diff:
  + Added missing patch header
* Removed unused patch invalid_const_char_conversion_fixes.diff

[ Kumar Appaiah ]
* New upstream release.
* Standards Version is now 3.9.0 (No changes needed)
* Update debian/rules to specify version numbers.

Show diffs side-by-side

added added

removed removed

Lines of Context:
speech_class/EST_wave_io.cc
68
68
 
69
69
int nist_get_param_int(const char *hdr, const char *field, int def_val)
70
70
{
71
 
    char *p;
 
71
    const char *p;
72
72
    int val;
73
73
 
74
74
    if (((p=strstr(hdr,field)) != NULL) &&
84
84
 
85
85
char *nist_get_param_str(const char *hdr, const char *field, const char *def_val)
86
86
{
87
 
    char *p,*val;
 
87
    const char *p;
 
88
    char *val;
88
89
    int size;
89
90
 
90
91
    if (((p=strstr(hdr,field)) != NULL) &&
173
174
 
174
175
    current_pos = ts.tell();
175
176
    if (ts.fread(header,NIST_HDR_SIZE,1) != 1)
176
 
        return misc_read_error;
 
177
        return wrong_format;
177
178
 
178
179
    if (strncmp(header,NIST_SIG,sizeof(NIST_SIG)) != 0)
179
180
        return wrong_format;