← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/firebird2.5/oneiric-security

« back to all changes in this revision

Viewing changes to src/burp/backup.epp

  • Committer: Bazaar Package Importer
  • Author(s): Damyan Ivanov
  • Date: 2010-07-27 18:12:34 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20100727181234-88lvl2nuord9ysx5
Tags: 2.5.0.26054~ReleaseCandidate3.ds2-1
* New upstream release candidate

* update d/copyright to reflect changes in upstream sources
* drop patches applied/implemented upstream
  + refresh the rest to apply cleanly
* Standards-Version: 3.9.1 (no changes necessary)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/burp/backup.epp
72
72
 
73
73
#define DB                      tdgbl->db_handle
74
74
#define gds_trans       tdgbl->tr_handle
75
 
#define isc_status      tdgbl->status
 
75
#define isc_status      tdgbl->status_vector
76
76
 
77
77
namespace // unnamed, private
78
78
{
1241
1241
                                          NULL, // param for subset of an array handling
1242
1242
                                          slice_length, slice, (SLONG*) &return_length))
1243
1243
        {
1244
 
                BURP_print(81, field->fld_name);
 
1244
                BURP_print(true, 81, field->fld_name);
1245
1245
                // msg 81 error accessing blob field %s -- continuing
1246
1246
                BURP_print_status(status_vector);
1247
1247
#ifdef DEBUG
1386
1386
 
1387
1387
        if (!blob.open(DB, gds_trans, blob_id))
1388
1388
        {
1389
 
                BURP_print(81, field->fld_name);
 
1389
                BURP_print(true, 81, field->fld_name);
1390
1390
                // msg 81 error accessing blob field %s -- continuing
1391
1391
                BURP_print_status(status_vector);
1392
1392
                return;
1556
1556
                        break;
1557
1557
 
1558
1558
                default:
1559
 
                        BURP_print(79, SafeArg() << int(item));
 
1559
                        BURP_print(true, 79, SafeArg() << int(item));
1560
1560
                        // msg 79 don't understand blob info item %ld
1561
1561
                        if (!blob.close())
1562
1562
                                BURP_error_redirect(status_vector, 23);
1988
1988
 
1989
1989
                        if (count != (ULONG) X.RDB$SEGMENT_COUNT)
1990
1990
                        {
1991
 
                                BURP_print(180, SafeArg() << X.RDB$INDEX_NAME << count << X.RDB$SEGMENT_COUNT);
 
1991
                                BURP_print(true, 180, SafeArg() << X.RDB$INDEX_NAME << count << X.RDB$SEGMENT_COUNT);
1992
1992
                                continue;
1993
1993
                        }
1994
1994
 
2052
2052
                                        general_on_error();
2053
2053
                                END_ERROR;
2054
2054
                                if (!match)
2055
 
                                        BURP_print (179, SafeArg() << I_S.RDB$FIELD_NAME << X.RDB$INDEX_NAME);
 
2055
                                        BURP_print (true, 179, SafeArg() << I_S.RDB$FIELD_NAME << X.RDB$INDEX_NAME);
2056
2056
                                else
2057
2057
                                        count++;
2058
2058
                        END_FOR;
2062
2062
 
2063
2063
                        if (count != (ULONG) X.RDB$SEGMENT_COUNT)
2064
2064
                        {
2065
 
                                BURP_print(180, SafeArg() << X.RDB$INDEX_NAME << count << X.RDB$SEGMENT_COUNT);
 
2065
                                BURP_print(true, 180, SafeArg() << X.RDB$INDEX_NAME << count << X.RDB$SEGMENT_COUNT);
2066
2066
                                continue;
2067
2067
                        }
2068
2068
 
2477
2477
                        break;
2478
2478
 
2479
2479
                default:
2480
 
                        BURP_print(79, SafeArg() << int(item));
 
2480
                        BURP_print(true, 79, SafeArg() << int(item));
2481
2481
                        // msg 79 don't understand blob info item %ld
2482
2482
                        if (!blob.close())
2483
2483
                        {