fiddlerwoaroof/crawl - Change 7IAREA6ETDRIFRARG5MEAZMXQV44FQZT3VIWJG6AAZRIEFNHKNQAC

Made make_time_string() return std::string, not char*.

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

Created by haranp on May 15, 2007

7IAREA6ETDRIFRARG5MEAZMXQV44FQZT3VIWJG6AAZRIEFNHKNQAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/stuff.h at line 21 [3.217090]

B:BD[3.217419] → [4.132783:132883]

char *const make_time_string(time_t abs_time, char *const buff, int buff_size, bool terse = false);

[3.217419]

[3.217500]

std::string make_time_string(time_t abs_time, bool terse = false);

Insertion in crawl-ref/source/stuff.cc at line 23 [3.224557]
[5.103922]
[3.224956]
```
#include <sstream>
#include <iomanip>
```

Replacement in crawl-ref/source/stuff.cc at line 71 [3.224557]

B:BD[3.225624] → [4.133406:133529]

char *const make_time_string( time_t abs_time, char *const buff, int buff_size,
                              bool terse )

[3.225624]

[3.225705]

std::string make_time_string( time_t abs_time, bool terse )

Replacement in crawl-ref/source/stuff.cc at line 78 [3.224557]
B:BD[3.225880] → [3.225880:225903]
```
    char day_buff[32];
```
[3.225880]
[3.225903]
```
    std::ostringstream buff;
    buff << std::setfill('0');
```

Replacement in crawl-ref/source/stuff.cc at line 84 [3.224557]

B:BD[4.133549] → [4.133549:133612]

            snprintf(day_buff, sizeof day_buff, "%d, ", days);

[4.133549]

[4.133612]

            buff << days << ", ";

Replacement in crawl-ref/source/stuff.cc at line 86 [3.224557]

B:BD[4.133625] → [4.133625:133690]

∅:D[4.133690] → [3.225989:226038]

B:BD[3.225989] → [3.225989:226038]

            snprintf( day_buff, sizeof(day_buff), "%d day%s, ", 
                  days, (days > 1) ? "s" : "" );

[4.133625]

[3.226038]

            buff << days << (days > 1 ? " days" : "day");

Replacement in crawl-ref/source/stuff.cc at line 89 [3.224557]

B:BD[3.226045] → [3.226045:226180]

    snprintf( buff, buff_size, "%s%02d:%02d:%02d", 
              (days > 0) ? day_buff : "", hours, mins, secs );
    return (buff);

[3.226045]

[3.226180]

    buff << std::setw(2) << hours << ':'
         << std::setw(2) << mins << ':'
         << std::setw(2) << secs;
    return buff.str();

Deletion in crawl-ref/source/output.cc at line 809 [3.1088282]

B:BD[4.209043] → [4.209043:209128]

        char buff[200];
        make_time_string( curr, buff, sizeof(buff), true );

Replacement in crawl-ref/source/output.cc at line 812 [3.1088282]

B:BD[6.3892] → [6.3892:3932]

                 buff, you.num_turns );

[6.3892]

[6.3932]

                 make_time_string(curr).c_str(), you.num_turns );

Deletion in crawl-ref/source/output.cc at line 1010 [3.1088282]

B:BD[7.1274] → [7.1274:1359]

        char buff[200];
        make_time_string( curr, buff, sizeof(buff), true );

Replacement in crawl-ref/source/output.cc at line 1012 [3.1088282]

B:BD[7.1449] → [7.1449:1489]

                 you.num_turns, buff );

[7.1449]

[7.1489]

                 you.num_turns, make_time_string(curr, true).c_str() );

Deletion in crawl-ref/source/hiscores.cc at line 1164 [3.2987663]
B:BD[5.829215] → [5.829215:829241]
```
            char tmp[80];
```
Deletion in crawl-ref/source/hiscores.cc at line 1177 [3.2987663]
B:BD[5.829567] → [5.829567:829630]
```
            make_time_string( real_time, tmp, sizeof(tmp) );
```

Replacement in crawl-ref/source/hiscores.cc at line 1178 [3.2987663]

B:BD[5.829706] → [5.829706:829756]

                      username, tmp, num_turns );

[5.829706]

[5.829756]

                      username, make_time_string(real_time).c_str(),
                      num_turns );

Deletion in crawl-ref/source/chardump.cc at line 378 [3.4100336]
B:BD[3.4104793] → [3.4104793:4104873]
```
        char buff[200];
        make_time_string( curr, buff, sizeof(buff) );
```
Replacement in crawl-ref/source/chardump.cc at line 379 [3.4100336]
B:BD[3.4104904] → [3.4104904:4104926]
```
        text += buff;
```
[3.4104904]
[3.4104926]
```
        text += make_time_string(curr);
```

Replacement in crawl-ref/source/acr.cc at line 1019 [3.4397395]

B:BD[5.1262577] → [5.1262577:1262601]

∅:D[5.1262763] → [3.4424210:4424211]

B:BD[3.4424210] → [3.4424210:4424211]

B:BD[3.4424211] → [2.27933:28048]

        char buff[200];
        mprf("Play time: %s (%ld turns)",
             make_time_string(curr, buff, sizeof buff), you.num_turns );

[5.1262577]

[5.1262785]

        msg::stream << "Play time: " << make_time_string(curr)
                    << " (" << you.num_turns << " turns)"
                    << std::endl;