← Back to branch summary

~ubuntu-branches/ubuntu/precise/orbit2/precise

« back to all changes in this revision

Viewing changes to src/orb/orb-core/corba-loc.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2008-09-24 22:30:20 UTC
  • mfrom: (1.2.16 upstream)
  • Revision ID: james.westby@ubuntu.com-20080924223020-gaasw9ry7s363vii
Tags: 1:2.14.16-0ubuntu1
New upstream version

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/orb/orb-core/corba-loc.c
294
294
                corbaloc += strlen("corbaloc:");
295
295
        
296
296
        /* dup. multi profile + object key */ 
297
 
        loc = g_strdup (corbaloc);
 
297
        loc = g_strdup (corbaloc); 
298
298
 
299
299
        /* split at last '/' */ 
300
300
        okey = strrchr (loc, '/');
341
341
                        
342
342
                }
343
343
        }
344
 
 
345
 
        CORBA_free (objkey);
 
344
        goto ret_ok;
 
345
 
 
346
ret_error:
 
347
        if (profiles) {
 
348
                IOP_delete_profiles (NULL, &profiles);
 
349
                profiles = NULL;
 
350
        }
 
351
 
 
352
ret_ok:
 
353
        if (loc)
 
354
                g_free (loc);        /* also free's okey */
 
355
        if (token)
 
356
                g_strfreev (token);
 
357
        if (objkey)
 
358
                CORBA_free (objkey);
346
359
 
347
360
        return profiles;
348
 
        
349
 
 ret_error:
350
 
        if (loc)    g_free (loc);        /* also free's okey */
351
 
        if (token)  g_strfreev (token);
352
 
        if (objkey) CORBA_free (objkey);
353
 
        if (profiles) IOP_delete_profiles (NULL, &profiles);
354
 
                
355
 
        return NULL;
356
361
}
357
362
 
358
363
static gboolean