← Back to branch summary

~ubuntu-branches/debian/squeeze/firebird2.0/squeeze

« back to all changes in this revision

Viewing changes to src/jrd/sdl.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Damyan Ivanov
  • Date: 2009-05-04 11:17:29 UTC
  • mfrom: (5.1.1 experimental)
  • Revision ID: james.westby@ubuntu.com-20090504111729-vrob1xe54hrvf8ij
Tags: 2.0.5.13206-0.ds2-3
change Section to database

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/jrd/sdl.cpp
157
157
        if (dimensions != desc->iad_dimensions) {
158
158
                error(status_vector, isc_invalid_dimension,
159
159
                          isc_arg_number, (SLONG) desc->iad_dimensions,
160
 
                          isc_arg_number, (SLONG) dimensions, 0);
 
160
                          isc_arg_number, (SLONG) dimensions, isc_arg_end);
161
161
                return -1;
162
162
        }
163
163
 
169
169
        {
170
170
                const SLONG n = *subscripts++;
171
171
                if (n < range->iad_lower || n > range->iad_upper) {
172
 
                        error(status_vector, isc_out_of_bounds, 0);
 
172
                        error(status_vector, isc_out_of_bounds, isc_arg_end);
173
173
                        return -1;
174
174
                }
175
175
                subscript += (n - range->iad_lower) * range->iad_length;
202
202
 
203
203
        if (*p++ != isc_sdl_version1)
204
204
                return error(status_vector, isc_invalid_sdl,
205
 
                                         isc_arg_number, (SLONG) 0, 0);
 
205
                                         isc_arg_number, (SLONG) 0, isc_arg_end);
206
206
 
207
207
        for (;;)
208
208
                switch (*p++) {
210
210
                        n = *p++;
211
211
                        if (n != 1)
212
212
                                return error(status_vector, isc_invalid_sdl,
213
 
                                                         isc_arg_number, (SLONG) (p - sdl - 1), 0);
 
213
                                                         isc_arg_number, (SLONG) (p - sdl - 1), isc_arg_end);
214
214
                        offset = p - sdl;
215
215
                        if (!(p = sdl_desc(p, &info->sdl_info_element)))
216
216
                                return error(status_vector, isc_invalid_sdl,
217
 
                                                         isc_arg_number, (SLONG) offset, 0);
 
217
                                                         isc_arg_number, (SLONG) offset, isc_arg_end);
218
218
                        info->sdl_info_element.dsc_address = 0;
219
219
                        break;
220
220
 
373
373
                                offset = p - sdl - 1;
374
374
                                if (!(p = sdl_desc(p, &junk))) 
375
375
                                        return error(status_vector, isc_invalid_sdl,
376
 
                                                                 isc_arg_number, (SLONG) offset, 0);
 
376
                                                                 isc_arg_number, (SLONG) offset, isc_arg_end);
377
377
                        }
378
378
                        break;
379
379
 
519
519
                if (arg && count != arg->sdl_arg_desc->iad_dimensions) {
520
520
                        error(arg->sdl_arg_status_vector, isc_invalid_dimension,
521
521
                                  isc_arg_number, (SLONG) arg->sdl_arg_desc->iad_dimensions,
522
 
                                  isc_arg_number, (SLONG) count, 0);
 
522
                                  isc_arg_number, (SLONG) count, isc_arg_end);
523
523
                        return NULL;
524
524
                }
525
525
                expr = expressions;
556
556
 
557
557
        default:
558
558
                error(arg->sdl_arg_status_vector, isc_invalid_sdl,
559
 
                          isc_arg_number, (SLONG) (p - arg->sdl_arg_sdl - 1), 0);
 
559
                          isc_arg_number, (SLONG) (p - arg->sdl_arg_sdl - 1), isc_arg_end);
560
560
                return NULL;
561
561
        }
562
562
}
719
719
                                {
720
720
                                        const SLONG n = *stack_ptr++;
721
721
                                        if (n < range->iad_lower || n > range->iad_upper) {
722
 
                                                error(arg->sdl_arg_status_vector, isc_out_of_bounds, 0);
 
722
                                                error(arg->sdl_arg_status_vector, isc_out_of_bounds, isc_arg_end);
723
723
                                                return false;
724
724
                                        }
725
725
                                        subscript += (n - range->iad_lower) * range->iad_length;