← Back to branch summary

~ubuntu-branches/ubuntu/vivid/aeolus/vivid

« back to all changes in this revision

Viewing changes to model.cc

  • Committer: Bazaar Package Importer
  • Author(s): Free Ekanayaka
  • Date: 2010-01-16 15:05:00 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20100116150500-0o7d0fuj7hblpnup
Tags: 0.8.2-1
http://bugs.debian.org/564849
* New upstream version
* Add missing build-dependency on libreadline5-dev (Closes: #564849)

Show diffs side-by-side

added added

removed removed

Lines of Context:
model.cc
1320
1320
    FILE           *F;
1321
1321
    Preset         *P;
1322
1322
 
1323
 
    F = 0;
1324
1323
    if (_uhome)
1325
1324
    {
1326
1325
        p = (unsigned char *)(getenv ("HOME"));
1327
1326
        if (p) sprintf (name, "%s/.aeolus-presets", p);
1328
1327
        else strcpy (name, ".aeolus-presets");
1329
 
        F = fopen (name, "r"); 
1330
 
        if (F == 0)
1331
 
        {
1332
 
            fprintf (stderr, "Can't open '%s' for reading\n", name);
1333
 
        }
1334
1328
    }
1335
 
    if (F == 0)
 
1329
    else
1336
1330
    {
1337
1331
        sprintf (name, "%s/presets", _instr);
1338
 
        F = fopen (name, "r"); 
1339
1332
    }
1340
 
    if (F == 0)
 
1333
    if (! (F = fopen (name, "r"))) 
1341
1334
    {
1342
1335
        fprintf (stderr, "Can't open '%s' for reading\n", name);
1343
1336
        return 1;