fiddlerwoaroof/crawl - Change Z262AMUK447BTC7MVOPQQ3NZTQXQOE5JODNHXN3IU7WL4ABSW5YQC

[1626673] When croaking in files.cc, make sure the user can see the error message.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@784 c06c8d41-db1a-0410-9941-cceddc491573

Created by dshaligram on January 4, 2007

Z262AMUK447BTC7MVOPQQ3NZTQXQOE5JODNHXN3IU7WL4ABSW5YQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/stuff.h at line 55 [5.217090]
∅:D[3.2189] → [5.220263:220286]
B:BD[5.220263] → [5.220263:220286]
```
void end(int end_arg);
```
[3.2189]
[5.220286]
```
void end(int exit_code, bool print_err = false,
         const char *message = NULL, ...);
```
Replacement in crawl-ref/source/stuff.cc at line 482 [5.224557]
B:BD[5.231233] → [3.2213:2235]
```
void end(int end_arg)
```
[5.231233]
[3.2235]
```
void end(int exit_code, bool print_error, const char *format, ...)
```
Insertion in crawl-ref/source/stuff.cc at line 484 [5.224557]
[3.2237]
[3.2237]
```
    std::string error = print_error? strerror(errno) : "";
    
```

Replacement in crawl-ref/source/stuff.cc at line 487 [5.224557]

∅:D[3.2255] → [5.231233:231252]

B:BD[5.231233] → [5.231233:231252]

    exit(end_arg);

[3.2255]

[5.231252]


    if (format)
    {
        va_list arg;
        va_start(arg, format);
        char buffer[500];
        vsnprintf(buffer, sizeof buffer, format, arg);
        va_end(arg);
        
        if (error.empty())
            error = std::string(buffer);
        else
            error = std::string(buffer) + ": " + error;
    }
    if (error.length())
    {
        if (error[error.length() - 1] != '\n')
            error += "\n";
        fprintf(stderr, "%s", error.c_str());
    }
    
    exit(exit_code);

Replacement in crawl-ref/source/files.cc at line 757 [5.3084589]

B:BD[5.3097591] → [5.3097591:3097673]

            perror("\nLevel file appears to be invalid.\n");
            end(-1);

[5.3097591]

[5.3097673]

            end(-1, false, "\nLevel file appears to be invalid.\n");

Replacement in crawl-ref/source/files.cc at line 765 [5.3084589]

B:BD[5.3097829] → [6.866721:866823]

∅:D[6.866823] → [5.3097923:3097970]

B:BD[5.3097923] → [5.3097923:3097970]

            snprintf( info, INFO_SIZE, "\nIncomplete read of \"%s\" - aborting.\n", cha_fil.c_str());
            perror(info);
            end(-1);

[5.3097829]

[5.3097970]

            end(-1, false, "\nIncomplete read of \"%s\" - aborting.\n",
                cha_fil.c_str());

Replacement in crawl-ref/source/files.cc at line 1143 [5.3084589]

B:BD[5.3111699] → [6.868335:868407]

        snprintf(info, INFO_SIZE, "Unable to open \"%s\" for writing!",

[5.3111699]

[6.868407]

        end(-1, true, "Unable to open \"%s\" for writing",

Deletion in crawl-ref/source/files.cc at line 1145 [5.3084589]
∅:D[6.868442] → [5.3111815:3111854]
B:BD[5.3111815] → [5.3111815:3111854]
```
        perror(info);
        end(-1);
```
Replacement in crawl-ref/source/files.cc at line 1208 [5.3084589]
B:BD[6.870324] → [6.870324:870342]
B:BD[6.870342] → [2.939:1013]
∅:D[2.1013] → [6.870409:870445]
B:BD[6.870409] → [6.870409:870445]
B:BD[6.870445] → [2.1014:1053]
∅:D[2.1053] → [5.3113287:3113293]
∅:D[6.870470] → [5.3113287:3113293]
B:BD[5.3113287] → [5.3113287:3113293]
```
    if (!charf) {
        snprintf(info, INFO_SIZE, "Unable to open \"%s\" for writing!\n",
                 charFile.c_str());
        perror(info);
        end(-1);
    }
```
[6.870324]
[5.3113489]
```
    if (!charf)
        end(-1, true, "Unable to open \"%s\" for writing!\n", charFile.c_str());
```
Replacement in crawl-ref/source/files.cc at line 1355 [5.3084589]
∅:D[6.871905] → [5.3117505:3117511]
B:BD[5.3117505] → [5.3117505:3117511]
B:BD[5.3117511] → [2.1054:1161]
∅:D[2.1161] → [5.3117626:3117671]
∅:D[6.871992] → [5.3117626:3117671]
B:BD[5.3117626] → [5.3117626:3117671]
```
    {
        snprintf(info, INFO_SIZE, "Unable to open %s for reading!\n",
                 charFile.c_str() );
        perror(info);
        end(-1);
    }
```
[6.871905]
[5.3117671]
```
        end(-1, true, "Unable to open %s for reading!\n", charFile.c_str() );
```
Replacement in crawl-ref/source/files.cc at line 1370 [5.3084589]
∅:D[6.872136] → [5.3117990:3117996]
B:BD[5.3117990] → [5.3117990:3117996]
B:BD[5.3117996] → [6.872137:872217]
B:BD[6.872217] → [2.1162:1199]
∅:D[2.1199] → [5.3118085:3118130]
∅:D[6.872240] → [5.3118085:3118130]
B:BD[5.3118085] → [5.3118085:3118130]
```
    {
        snprintf( info, INFO_SIZE, "\nIncomplete read of \"%s\" - aborting.\n",
                  charFile.c_str());
        perror(info);
        end(-1);
    }
```
[6.872136]
[5.3118130]
```
        end(-1, false, "\nIncomplete read of \"%s\" - aborting.\n",
            charFile.c_str());
```

Replacement in crawl-ref/source/files.cc at line 1434 [5.3084589]

B:BD[5.3119099] → [5.3119099:3119192]

        snprintf( info, INFO_SIZE, "\nSorry, this release cannot read a v%d.%d savefile.\n",

[5.3119099]

[5.3119192]

        end(-1, false, "\nSorry, this release cannot read a v%d.%d savefile.\n",

Deletion in crawl-ref/source/files.cc at line 1436 [5.3084589]
B:BD[5.3119233] → [5.3119233:3119272]
```
        perror(info);
        end(-1);
```

Replacement in crawl-ref/source/files.cc at line 1500 [5.3084589]

B:BD[5.3121067] → [5.3121067:3121162]

        snprintf( info, INFO_SIZE, "\nSorry, this release cannot read a v%d.%d level file.\n",

[5.3121067]

[5.3121162]

        end(-1, false,
            "\nSorry, this release cannot read a v%d.%d level file.\n",

Deletion in crawl-ref/source/files.cc at line 1503 [5.3084589]
B:BD[5.3121203] → [5.3121203:3121242]
```
        perror(info);
        end(-1);
```

Replacement in crawl-ref/source/files.cc at line 2142 [5.3084589]

B:BD[4.894] → [4.894:974]

        fprintf(stderr, "String too long: %d bytes\n", length);
        end(1);

[4.894]

[4.974]

        end(1, false, "String too long: %d bytes\n", length);

[1626673] When croaking in files.cc, make sure the user can see the error message.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/stuff.h at line 55 [5.217090]

Replacement in crawl-ref/source/stuff.cc at line 482 [5.224557]

Insertion in crawl-ref/source/stuff.cc at line 484 [5.224557]

Replacement in crawl-ref/source/stuff.cc at line 487 [5.224557]

Replacement in crawl-ref/source/files.cc at line 757 [5.3084589]

Replacement in crawl-ref/source/files.cc at line 765 [5.3084589]

Replacement in crawl-ref/source/files.cc at line 1143 [5.3084589]

Deletion in crawl-ref/source/files.cc at line 1145 [5.3084589]

Replacement in crawl-ref/source/files.cc at line 1208 [5.3084589]

Replacement in crawl-ref/source/files.cc at line 1355 [5.3084589]

Replacement in crawl-ref/source/files.cc at line 1370 [5.3084589]

Replacement in crawl-ref/source/files.cc at line 1434 [5.3084589]

Deletion in crawl-ref/source/files.cc at line 1436 [5.3084589]

Replacement in crawl-ref/source/files.cc at line 1500 [5.3084589]

Deletion in crawl-ref/source/files.cc at line 1503 [5.3084589]

Replacement in crawl-ref/source/files.cc at line 2142 [5.3084589]