← Back to branch summary

~ubuntu-branches/ubuntu/raring/libxfont/raring-security

« back to all changes in this revision

Viewing changes to src/fontfile/catalogue.c

  • Committer: Package Import Robot
  • Author(s): Cyril Brulebois, Cyril Brulebois, Julien Cristau
  • Date: 2012-03-04 09:24:59 UTC
  • mfrom: (1.1.15)
  • Revision ID: package-import@ubuntu.com-20120304092459-cbu7e0ujz24lslpt
Tags: 1:1.4.5-1
http://bugs.debian.org/654154
[ Cyril Brulebois ]
* New upstream release.
* Switch to dh:
  - Bump debhelper build-dep and compat.
  - Rewrite debian/rules, using autoreconf and quilt sequences.
  - Adjust build dependencies accordingly.
  - Use build-main and build-udeb as build directories.
  - Adjust .install accordingly.
* Remove xsfbs accordingly.
* Add support for hardened build flags through dpkg-buildflags, based
  on a patch by Moritz Muehlenhoff, thanks! (Closes: #654154).

[ Julien Cristau ]
* Remove David Nusinow from Uploaders.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/fontfile/catalogue.c
60
60
            cat->fpeAlloc = 16;
61
61
        else
62
62
            cat->fpeAlloc *= 2;
63
 
        
 
63
 
64
64
        new = realloc(cat->fpeList, cat->fpeAlloc * sizeof(FontPathElementPtr));
65
65
        if (new == NULL)
66
66
            return AllocError;
251
251
CatalogueResetFPE (FontPathElementPtr fpe)
252
252
{
253
253
    /* Always just tell the caller to close and re-open */
254
 
    return FPEResetFailed;      
 
254
    return FPEResetFailed;
255
255
}
256
256
 
257
257
static int
277
277
}
278
278
 
279
279
static int
280
 
CatalogueOpenFont (pointer client, FontPathElementPtr fpe, Mask flags, 
281
 
                   char *name, int namelen, 
 
280
CatalogueOpenFont (pointer client, FontPathElementPtr fpe, Mask flags,
 
281
                   char *name, int namelen,
282
282
                   fsBitmapFormat format, fsBitmapFormatMask fmask,
283
 
                   XID id, FontPtr *pFont, char **aliasName, 
 
283
                   XID id, FontPtr *pFont, char **aliasName,
284
284
                   FontPtr non_cachable_font)
285
285
{
286
286
    CataloguePtr cat = fpe->private;
300
300
        if (status == Successful || status == FontNameAlias)
301
301
            return status;
302
302
    }
303
 
            
 
303
 
304
304
    return BadFontName;
305
305
}
306
306
 
314
314
}
315
315
 
316
316
static int
317
 
CatalogueListFonts (pointer client, FontPathElementPtr fpe, char *pat, 
 
317
CatalogueListFonts (pointer client, FontPathElementPtr fpe, char *pat,
318
318
                    int len, int max, FontNamesPtr names)
319
319
{
320
320
    CataloguePtr cat = fpe->private;
335
335
}
336
336
 
337
337
int
338
 
FontFileStartListFonts(pointer client, FontPathElementPtr fpe, 
339
 
                       char *pat, int len, int max, 
 
338
FontFileStartListFonts(pointer client, FontPathElementPtr fpe,
 
339
                       char *pat, int len, int max,
340
340
                       pointer *privatep, int mark_aliases);
341
341
 
342
342
typedef struct _LFWIData {
345
345
} LFWIDataRec, *LFWIDataPtr;
346
346
 
347
347
static int
348
 
CatalogueStartListFonts(pointer client, FontPathElementPtr fpe, 
 
348
CatalogueStartListFonts(pointer client, FontPathElementPtr fpe,
349
349
                        char *pat, int len, int max, pointer *privatep,
350
350
                        int mark_aliases)
351
351
{
381
381
}
382
382
 
383
383
static int
384
 
CatalogueStartListFontsWithInfo(pointer client, FontPathElementPtr fpe, 
385
 
                                char *pat, int len, int max, 
 
384
CatalogueStartListFontsWithInfo(pointer client, FontPathElementPtr fpe,
 
385
                                char *pat, int len, int max,
386
386
                                pointer *privatep)
387
387
{
388
388
    return CatalogueStartListFonts(client, fpe, pat, len, max, privatep, 0);
389
389
}
390
390
 
391
391
static int
392
 
CatalogueListNextFontWithInfo(pointer client, FontPathElementPtr fpe, 
393
 
                              char **namep, int *namelenp, 
 
392
CatalogueListNextFontWithInfo(pointer client, FontPathElementPtr fpe,
 
393
                              char **namep, int *namelenp,
394
394
                              FontInfoPtr *pFontInfo,
395
395
                              int *numFonts, pointer private)
396
396
{
419
419
}
420
420
 
421
421
static int
422
 
CatalogueStartListFontsAndAliases(pointer client, FontPathElementPtr fpe, 
423
 
                                  char *pat, int len, int max, 
 
422
CatalogueStartListFontsAndAliases(pointer client, FontPathElementPtr fpe,
 
423
                                  char *pat, int len, int max,
424
424
                                  pointer *privatep)
425
425
{
426
426
    return CatalogueStartListFonts(client, fpe, pat, len, max, privatep, 1);
427
427
}
428
428
 
429
429
static int
430
 
CatalogueListNextFontOrAlias(pointer client, FontPathElementPtr fpe, 
 
430
CatalogueListNextFontOrAlias(pointer client, FontPathElementPtr fpe,
431
431
                             char **namep, int *namelenp, char **resolvedp,
432
432
                             int *resolvedlenp, pointer private)
433
433
{