diff options
| author | rbuj <[email protected]> | 2021-10-27 17:30:36 +0200 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2021-11-20 18:31:11 +0100 |
| commit | 816d2dc8226f8d271aa1a6cd30549614769d5267 (patch) | |
| tree | b7bf882bb656964b9a919d4467fbde54fd9be867 | |
| parent | 0c38b79c9556e475652d37556f0b2ffd73e0a4e4 (diff) | |
| download | atril-816d2dc8226f8d271aa1a6cd30549614769d5267.tar.bz2 atril-816d2dc8226f8d271aa1a6cd30549614769d5267.tar.xz | |
Use a blank line at most
83 files changed, 0 insertions, 220 deletions
diff --git a/backend/comics/comics-document.c b/backend/comics/comics-document.c index d799b208..ed02a35c 100644 --- a/backend/comics/comics-document.c +++ b/backend/comics/comics-document.c @@ -126,7 +126,6 @@ static void render_pixbuf_size_prepared_cb (GdkPixbufLoader *loader, static char** extract_argv (EvDocument *document, gint page); - EV_BACKEND_REGISTER_WITH_CODE (ComicsDocument, comics_document, { EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_THUMBNAILS, @@ -186,7 +185,6 @@ comics_regex_quote (const gchar *unquoted_string) return g_string_free (dest, FALSE); } - /* This function manages the command for decompressing a comic book */ static gboolean comics_decompress_temp_dir (const gchar *command_decompress_tmp, @@ -627,7 +625,6 @@ comics_document_load (EvDocument *document, return TRUE; } - static gboolean comics_document_save (EvDocument *document, const char *uri, diff --git a/backend/djvu/djvu-document.c b/backend/djvu/djvu-document.c index b3e41a8d..9ed327ad 100644 --- a/backend/djvu/djvu-document.c +++ b/backend/djvu/djvu-document.c @@ -66,7 +66,6 @@ EV_BACKEND_REGISTER_WITH_CODE (DjvuDocument, djvu_document, EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_SELECTION, djvu_selection_iface_init); }); - #define EV_DJVU_ERROR ev_djvu_error_quark () static GQuark @@ -256,7 +255,6 @@ djvu_document_load (EvDocument *document, return TRUE; } - static gboolean djvu_document_save (EvDocument *document, const char *uri, @@ -676,7 +674,6 @@ djvu_document_find_find_text (EvDocumentFind *document, r->y2 = height - tmp * SCALE_FACTOR; } - return matches; } diff --git a/backend/djvu/djvu-links.c b/backend/djvu/djvu-links.c index da871dac..03da5983 100644 --- a/backend/djvu/djvu-links.c +++ b/backend/djvu/djvu-links.c @@ -181,7 +181,6 @@ build_tree (const DjvuDocument *djvu_document, if (!string_from_miniexp (miniexp_car (iter), &title)) goto unknown_entry; if (!string_from_miniexp (miniexp_cadr (iter), &link_dest)) goto unknown_entry; - if (!g_utf8_validate (title, -1, NULL)) { utf8_title = str_to_utf8 (title); title_markup = g_markup_escape_text (utf8_title, -1); @@ -342,7 +341,6 @@ get_djvu_hyperlink_mapping (DjvuDocument *djvu_document, return NULL; } - gboolean djvu_links_has_document_links (EvDocumentLinks *document_links) { diff --git a/backend/djvu/djvu-text-page.c b/backend/djvu/djvu-text-page.c index 6cbf54e6..72813bd4 100644 --- a/backend/djvu/djvu-text-page.c +++ b/backend/djvu/djvu-text-page.c @@ -23,7 +23,6 @@ #include <libdjvu/miniexp.h> #include "djvu-text-page.h" - /** * djvu_text_page_selection_process: * @page: #DjvuTextPage instance @@ -117,7 +116,6 @@ djvu_text_page_limits_process (DjvuTextPage *page, } } - static void djvu_text_page_limits (DjvuTextPage *page, miniexp_t p, @@ -404,7 +402,6 @@ djvu_text_page_search (DjvuTextPage *page, g_free (search_text); } - /** * djvu_text_page_prepare_search: * @page: #DjvuTextPage instance diff --git a/backend/djvu/djvu-text-page.h b/backend/djvu/djvu-text-page.h index a25284f5..ed8f3c7a 100644 --- a/backend/djvu/djvu-text-page.h +++ b/backend/djvu/djvu-text-page.h @@ -25,7 +25,6 @@ #include <glib.h> #include <libdjvu/miniexp.h> - typedef struct _DjvuTextPage DjvuTextPage; typedef struct _DjvuTextLink DjvuTextLink; diff --git a/backend/dvi/dvi-document.c b/backend/dvi/dvi-document.c index 1a84fe72..7971b662 100644 --- a/backend/dvi/dvi-document.c +++ b/backend/dvi/dvi-document.c @@ -110,7 +110,6 @@ dvi_document_load (EvDocument *document, mdvi_cairo_device_init (&dvi_document->context->device); - dvi_document->base_width = dvi_document->context->dvi_page_w * dvi_document->context->params.conv + 2 * unit2pix(dvi_document->params->dpi, MDVI_HMARGIN) / dvi_document->params->hshrink; @@ -123,7 +122,6 @@ dvi_document_load (EvDocument *document, return TRUE; } - static gboolean dvi_document_save (EvDocument *document, const char *uri, diff --git a/backend/dvi/fonts.c b/backend/dvi/fonts.c index 7c15f8d7..903eefa9 100644 --- a/backend/dvi/fonts.c +++ b/backend/dvi/fonts.c @@ -54,4 +54,3 @@ void mdvi_register_fonts (void) return; } - diff --git a/backend/dvi/mdvi-lib/afmparse.c b/backend/dvi/mdvi-lib/afmparse.c index f8d840b7..f01042d2 100644 --- a/backend/dvi/mdvi-lib/afmparse.c +++ b/backend/dvi/mdvi-lib/afmparse.c @@ -81,13 +81,10 @@ #define MATCH(A,B) (strncmp((A),(B), MAX_NAME) == 0) - - /*************************** GLOBALS ***********************/ static char *ident = NULL; /* storage buffer for keywords */ - /* "shorts" for fast case statement * The values of each of these enumerated items correspond to an entry in the * table of strings defined below. Therefore, if you add a new string as @@ -175,7 +172,6 @@ static char *token(FILE *stream) } /* token */ - /*************************** linetoken *************************/ /* "linetoken" will get read all tokens until the EOL character from @@ -203,7 +199,6 @@ static char *linetoken(FILE *stream) } /* linetoken */ - /*************************** recognize *************************/ /* This function tries to match a string to a known list of @@ -234,7 +229,6 @@ static enum parseKey recognize(char *ident) } /* recognize */ - /************************* parseGlobals *****************************/ /* This function is called by "parseFile". It will parse the AFM File @@ -401,8 +395,6 @@ static BOOL parseGlobals(FILE *fp, GlobalFontInfo *gfi) } /* parseGlobals */ - - #if 0 /* this function does not seem to be used anywhere */ /************************* initializeArray ************************/ @@ -584,7 +576,6 @@ static int parseCharWidths(FILE *fp, int *cwi) } /* parseCharWidths */ - /************************* parseCharMetrics ************************/ /* This function is called by parseFile if the caller of parseFile @@ -694,8 +685,6 @@ static int parseCharMetrics(FILE *fp, FontInfo *fi) } /* parseCharMetrics */ - - /************************* parseTrackKernData ***********************/ /* This function is called by "parseFile". It will parse the AFM File @@ -797,7 +786,6 @@ static int parseTrackKernData(FILE *fp, FontInfo *fi) } /* parseTrackKernData */ - /************************* parsePairKernData ************************/ /* This function is called by "parseFile". It will parse the AFM File @@ -918,7 +906,6 @@ static int parsePairKernData(FILE *fp, FontInfo *fi) } /* parsePairKernData */ - /************************* parseCompCharData **************************/ /* This function is called by "parseFile". It will parse the AFM File @@ -1043,12 +1030,8 @@ static int parseCompCharData(FILE *fp, FontInfo *fi) } /* parseCompCharData */ - - - /*************************** 'PUBLIC' FUNCTION ********************/ - /*************************** parseFile *****************************/ /* parseFile is the only 'public' procedure available. It is called @@ -1078,7 +1061,6 @@ extern int afm_parse_file(FILE *fp, FontInfo **fi, FLAGS flags) register char *keyword; /* used to store a token */ - /* storage data for the global variable ident */ ident = (char *) calloc(MAX_NAME, sizeof(char)); if (ident == NULL) {error = storageProblem; return(error);} diff --git a/backend/dvi/mdvi-lib/bitmap.c b/backend/dvi/mdvi-lib/bitmap.c index de1de6a7..877aef5d 100644 --- a/backend/dvi/mdvi-lib/bitmap.c +++ b/backend/dvi/mdvi-lib/bitmap.c @@ -117,7 +117,6 @@ static Uchar bit_swap[] = { 0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff }; - /* * next we have three bitmap functions to convert bitmaps in LSB bit order * with 8, 16 and 32 bits per unit, to our internal format. The differences @@ -192,7 +191,6 @@ BITMAP *bitmap_convert_msb8(Uchar *data, int w, int h, int stride) return bm; } - BITMAP *bitmap_copy(BITMAP *bm) { BITMAP *nb = bitmap_alloc(bm->width, bm->height); diff --git a/backend/dvi/mdvi-lib/color.c b/backend/dvi/mdvi-lib/color.c index ef6036a9..ced9ac0c 100644 --- a/backend/dvi/mdvi-lib/color.c +++ b/backend/dvi/mdvi-lib/color.c @@ -79,7 +79,6 @@ static int cc_entries; #define GAMMA_DIFF 0.005 - /* create a color table */ Ulong *get_color_table(DviDevice *dev, int nlevels, Ulong fg, Ulong bg, double gamma, int density) diff --git a/backend/dvi/mdvi-lib/color.h b/backend/dvi/mdvi-lib/color.h index cbc3c0ef..c87c4dcf 100644 --- a/backend/dvi/mdvi-lib/color.h +++ b/backend/dvi/mdvi-lib/color.h @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - #ifndef _COLOR_H_ #define _COLOR_H_ diff --git a/backend/dvi/mdvi-lib/fontmap.c b/backend/dvi/mdvi-lib/fontmap.c index 36111bd5..24b497bb 100644 --- a/backend/dvi/mdvi-lib/fontmap.c +++ b/backend/dvi/mdvi-lib/fontmap.c @@ -834,7 +834,6 @@ int mdvi_add_fontmap_file(const char *name, const char *fullpath) return 0; } - void mdvi_flush_encodings(void) { DviEncoding *enc; diff --git a/backend/dvi/mdvi-lib/hash.c b/backend/dvi/mdvi-lib/hash.c index 3327fa58..693f67f6 100644 --- a/backend/dvi/mdvi-lib/hash.c +++ b/backend/dvi/mdvi-lib/hash.c @@ -21,7 +21,6 @@ /* simple hash tables for MDVI */ - struct _DviHashBucket { DviHashBucket *next; DviHashKey key; diff --git a/backend/dvi/mdvi-lib/hash.h b/backend/dvi/mdvi-lib/hash.h index b10afd60..ed1cdfb0 100644 --- a/backend/dvi/mdvi-lib/hash.h +++ b/backend/dvi/mdvi-lib/hash.h @@ -3,7 +3,6 @@ /* Hash tables */ - typedef struct _DviHashBucket DviHashBucket; typedef struct _DviHashTable DviHashTable; @@ -18,7 +17,6 @@ typedef Ulong (*DviHashFunc) __PROTO((DviHashKey key)); typedef int (*DviHashComp) __PROTO((DviHashKey key1, DviHashKey key2)); typedef void (*DviHashFree) __PROTO((DviHashKey key, void *data)); - struct _DviHashTable { DviHashBucket **buckets; int nbucks; diff --git a/backend/dvi/mdvi-lib/mdvi.h b/backend/dvi/mdvi-lib/mdvi.h index a05f9278..a0857f3f 100644 --- a/backend/dvi/mdvi-lib/mdvi.h +++ b/backend/dvi/mdvi-lib/mdvi.h @@ -414,7 +414,6 @@ struct _DviRange { int step; /* step */ }; - typedef void (*DviSpecialHandler) __PROTO((DviContext *dvi, const char *prefix, const char *arg)); @@ -600,7 +599,6 @@ extern int font_free_unused __PROTO((DviDevice *)); extern int mdvi_encode_font __PROTO((DviParams *, DviFont *)); - /* font lookup functions */ extern int mdvi_register_font_type __PROTO((DviFontInfo *, int)); extern char **mdvi_list_font_class __PROTO((int)); diff --git a/backend/dvi/mdvi-lib/paper.h b/backend/dvi/mdvi-lib/paper.h index d42ee079..0eb2c938 100644 --- a/backend/dvi/mdvi-lib/paper.h +++ b/backend/dvi/mdvi-lib/paper.h @@ -24,7 +24,6 @@ struct _DviPaperSpec { const char *height; }; - extern int mdvi_get_paper_size __PROTO((const char *, DviPaper *)); extern DviPaperSpec* mdvi_get_paper_specs __PROTO((DviPaperClass)); extern void mdvi_free_paper_specs __PROTO((DviPaperSpec *)); diff --git a/backend/dvi/mdvi-lib/special.c b/backend/dvi/mdvi-lib/special.c index 64a1647b..93dd390e 100644 --- a/backend/dvi/mdvi-lib/special.c +++ b/backend/dvi/mdvi-lib/special.c @@ -212,7 +212,6 @@ void mdvi_flush_specials(void) { DviSpecial *sp, *list; - for(list = (DviSpecial *)specials.head; (sp = list); ) { list = sp->next; if(sp->prefix) mdvi_free(sp->prefix); diff --git a/backend/dvi/mdvi-lib/tfmfile.c b/backend/dvi/mdvi-lib/tfmfile.c index f7ba251f..52259dfb 100644 --- a/backend/dvi/mdvi-lib/tfmfile.c +++ b/backend/dvi/mdvi-lib/tfmfile.c @@ -258,7 +258,6 @@ int tfm_load_file(const char *filename, TFMInfo *info) /* allocate characters */ info->chars = xnalloc(TFMChar, size); - #ifdef WORD_LITTLE_ENDIAN /* byte-swap the three arrays at once (they are consecutive in memory) */ swap_array((Uint32 *)widths, nw + nh + nd); diff --git a/backend/epub/epub-document.c b/backend/epub/epub-document.c index 52530f47..979b50a0 100644 --- a/backend/epub/epub-document.c +++ b/backend/epub/epub-document.c @@ -224,7 +224,6 @@ epub_document_links_has_document_links(EvDocumentLinks *document_links) return TRUE; } - typedef struct _LinksCBStruct { GtkTreeModel *model; GtkTreeIter *parent; @@ -413,7 +412,6 @@ epub_remove_temporary_dir (gchar *path_name) return (g_remove (path_name)); } - static gboolean check_mime_type (const gchar* uri, GError** error); @@ -1546,7 +1544,6 @@ epub_document_check_add_night_sheet(EvDocument *document) gchar *csspath = g_strdup_printf("%s/atrilnightstyle.css",epub_document->documentdir); - GFile *styles = g_file_new_for_path (csspath); GOutputStream *outstream = (GOutputStream*)g_file_create(styles,G_FILE_CREATE_PRIVATE,NULL,NULL); if ( g_output_stream_write((GOutputStream*)outstream,style,strlen(style),NULL,NULL) == -1 ) @@ -1620,7 +1617,6 @@ epub_document_set_index_pages(GList *index,GList *contentList) g_list_foreach(index,(GFunc)page_set_function,contentList); } - static void add_mathjax_script_node_to_file(gchar *filename, gchar *data) { @@ -1768,7 +1764,6 @@ epub_document_init (EpubDocument *epub_document) epub_document->docTitle = NULL; } - static void epub_document_finalize (GObject *object) { @@ -1810,7 +1805,6 @@ epub_document_finalize (GObject *object) G_OBJECT_CLASS (epub_document_parent_class)->finalize (object); } - static void epub_document_class_init (EpubDocumentClass *klass) { diff --git a/backend/epub/minizip/ioapi.c b/backend/epub/minizip/ioapi.c index 7f5c191b..c20d20e3 100644 --- a/backend/epub/minizip/ioapi.c +++ b/backend/epub/minizip/ioapi.c @@ -25,7 +25,6 @@ #define FSEEKO_FUNC(stream, offset, origin) fseeko64(stream, offset, origin) #endif - #include "ioapi.h" voidpf call_zopen64 (const zlib_filefunc64_32_def* pfilefunc,const void*filename,int mode) @@ -82,8 +81,6 @@ void fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def* p_filef p_filefunc64_32->ztell32_file = p_filefunc32->ztell_file; } - - static voidpf ZCALLBACK fopen_file_func OF((voidpf opaque, const char* filename, int mode)); static uLong ZCALLBACK fread_file_func OF((voidpf opaque, voidpf stream, void* buf, uLong size)); static uLong ZCALLBACK fwrite_file_func OF((voidpf opaque, voidpf stream, const void* buf,uLong size)); @@ -128,7 +125,6 @@ static voidpf ZCALLBACK fopen64_file_func (voidpf opaque, const void* filename, return file; } - static uLong ZCALLBACK fread_file_func (voidpf opaque, voidpf stream, void* buf, uLong size) { uLong ret; @@ -150,7 +146,6 @@ static long ZCALLBACK ftell_file_func (voidpf opaque, voidpf stream) return ret; } - static ZPOS64_T ZCALLBACK ftell64_file_func (voidpf opaque, voidpf stream) { ZPOS64_T ret; @@ -206,7 +201,6 @@ static long ZCALLBACK fseek64_file_func (voidpf opaque, voidpf stream, ZPOS64_T return ret; } - static int ZCALLBACK fclose_file_func (voidpf opaque, voidpf stream) { int ret; diff --git a/backend/epub/minizip/ioapi.h b/backend/epub/minizip/ioapi.h index 7a0f44ad..eaf6b303 100644 --- a/backend/epub/minizip/ioapi.h +++ b/backend/epub/minizip/ioapi.h @@ -110,7 +110,6 @@ typedef unsigned long long int ZPOS64_T; extern "C" { #endif - #define ZLIB_FILEFUNC_SEEK_CUR (1) #define ZLIB_FILEFUNC_SEEK_END (2) #define ZLIB_FILEFUNC_SEEK_SET (0) @@ -122,7 +121,6 @@ extern "C" { #define ZLIB_FILEFUNC_MODE_EXISTING (4) #define ZLIB_FILEFUNC_MODE_CREATE (8) - #ifndef ZCALLBACK #if (defined(WIN32) || defined(_WIN32) || defined (WINDOWS) || defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK) #define ZCALLBACK CALLBACK @@ -131,9 +129,6 @@ extern "C" { #endif #endif - - - typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode)); typedef uLong (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size)); typedef uLong (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size)); @@ -143,7 +138,6 @@ typedef int (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stre typedef long (ZCALLBACK *tell_file_func) OF((voidpf opaque, voidpf stream)); typedef long (ZCALLBACK *seek_file_func) OF((voidpf opaque, voidpf stream, uLong offset, int origin)); - /* here is the "old" 32 bits structure structure */ typedef struct zlib_filefunc_def_s { @@ -185,7 +179,6 @@ typedef struct zlib_filefunc64_32_def_s seek_file_func zseek32_file; } zlib_filefunc64_32_def; - #define ZREAD64(filefunc,filestream,buf,size) ((*((filefunc).zfile_func64.zread_file)) ((filefunc).zfile_func64.opaque,filestream,buf,size)) #define ZWRITE64(filefunc,filestream,buf,size) ((*((filefunc).zfile_func64.zwrite_file)) ((filefunc).zfile_func64.opaque,filestream,buf,size)) //#define ZTELL64(filefunc,filestream) ((*((filefunc).ztell64_file)) ((filefunc).opaque,filestream)) diff --git a/backend/epub/minizip/unzip.c b/backend/epub/minizip/unzip.c index 0a23c1e4..3c4a6415 100644 --- a/backend/epub/minizip/unzip.c +++ b/backend/epub/minizip/unzip.c @@ -12,7 +12,6 @@ For more info read MiniZip_info.txt - ------------------------------------------------------------------------------------ Decryption code comes from crypt.c by Info-ZIP but has been greatly reduced in terms of compatibility with older software. The following is from the original crypt.c. @@ -48,7 +47,6 @@ Copyright (C) 2007-2008 Even Rouault - Oct-2009 - Mathias Svensson - Removed cpl_* from symbol names (Even Rouault added them but since this is now moved to a new project (minizip64) I renamed them again). Oct-2009 - Mathias Svensson - Fixed problem if uncompressed size was > 4G and compressed size was <4G should only read the compressed/uncompressed size from the Zip64 format if @@ -63,7 +61,6 @@ */ - #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -86,20 +83,17 @@ # include <errno.h> #endif - #ifndef local # define local static #endif /* compile with -Dlocal if your debugger can't find static symbols */ - #ifndef CASESENSITIVITYDEFAULT_NO # if !defined(unix) && !defined(CASESENSITIVITYDEFAULT_YES) # define CASESENSITIVITYDEFAULT_NO # endif #endif - #ifndef UNZ_BUFSIZE #define UNZ_BUFSIZE (16384) #endif @@ -118,14 +112,12 @@ #define SIZECENTRALDIRITEM (0x2e) #define SIZEZIPLOCALHEADER (0x1e) - /* unz_file_info_interntal contain internal info about a file in zipfile*/ typedef struct unz_file_info64_internal_s { ZPOS64_T offset_curfile;/* relative offset of local header 8 bytes */ } unz_file_info64_internal; - /* file_in_zip_read_info_s contain internal information about a file in zipfile, when reading and decompress it */ typedef struct @@ -156,7 +148,6 @@ typedef struct int raw; } file_in_zip64_read_info_s; - /* unz64_s contain internal information about the zipfile */ typedef struct @@ -189,7 +180,6 @@ typedef struct # endif } unz64_s; - #ifndef NOUNCRYPT #include "crypt.h" #endif @@ -200,7 +190,6 @@ typedef struct IN assertion: the stream s has been successfully opened for reading. */ - local int unz64local_getByte OF(( const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, @@ -224,7 +213,6 @@ local int unz64local_getByte(const zlib_filefunc64_32_def* pzlib_filefunc_def, v } } - /* =========================================================================== Reads a long in LSB order from the given gz_stream. Sets */ @@ -295,7 +283,6 @@ local int unz64local_getLong64 OF(( voidpf filestream, ZPOS64_T *pX)); - local int unz64local_getLong64 (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T *pX) @@ -364,7 +351,6 @@ local int strcmpcasenosensitive_internal (const char* fileName1, const char* fil } } - #ifdef CASESENSITIVITYDEFAULT_NO #define CASESENSITIVITYDEFAULTVALUE 2 #else @@ -418,7 +404,6 @@ local ZPOS64_T unz64local_SearchCentralDir(const zlib_filefunc64_32_def* pzlib_f if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0) return 0; - uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream); if (uMaxBack>uSizeFile) @@ -463,7 +448,6 @@ local ZPOS64_T unz64local_SearchCentralDir(const zlib_filefunc64_32_def* pzlib_f return uPosFound; } - /* Locate the Central directory 64 of a zipfile (at the end, just before the global comment) @@ -486,7 +470,6 @@ local ZPOS64_T unz64local_SearchCentralDir64(const zlib_filefunc64_32_def* pzlib if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0) return 0; - uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream); if (uMaxBack>uSizeFile) @@ -605,8 +588,6 @@ local unzFile unzOpenInternal (const void *path, us.z_filefunc = *pzlib_filefunc64_32_def; us.is64bitOpenFunction = is64bitOpenFunction; - - us.filestream = ZOPEN64(us.z_filefunc, path, ZLIB_FILEFUNC_MODE_READ | @@ -745,7 +726,6 @@ local unzFile unzOpenInternal (const void *path, us.pfile_in_zip_read = NULL; us.encrypted = 0; - s=(unz64_s*)ALLOC(sizeof(unz64_s)); if( s != NULL) { @@ -755,7 +735,6 @@ local unzFile unzOpenInternal (const void *path, return (unzFile)s; } - extern unzFile ZEXPORT unzOpen2 (const char *path, zlib_filefunc_def* pzlib_filefunc32_def) { @@ -814,7 +793,6 @@ extern int ZEXPORT unzClose (unzFile file) return UNZ_OK; } - /* Write info about the ZipFile in the *pglobal_info structure. No preparation of the structure is needed @@ -897,7 +875,6 @@ local int unz64local_GetCurrentFileInfoInternal (unzFile file, ZLIB_FILEFUNC_SEEK_SET)!=0) err=UNZ_ERRNO; - /* we check the magic */ if (err==UNZ_OK) { @@ -1002,7 +979,6 @@ local int unz64local_GetCurrentFileInfoInternal (unzFile file, else lSeek += file_info.size_file_extra; - if ((err==UNZ_OK) && (file_info.size_file_extra != 0)) { uLong acc = 0; @@ -1096,7 +1072,6 @@ local int unz64local_GetCurrentFileInfoInternal (unzFile file, else lSeek+=file_info.size_file_comment; - if ((err==UNZ_OK) && (pfile_info!=NULL)) *pfile_info=file_info; @@ -1106,8 +1081,6 @@ local int unz64local_GetCurrentFileInfoInternal (unzFile file, return err; } - - /* Write info about the ZipFile in the *pglobal_info structure. No preparation of the structure is needed @@ -1156,7 +1129,6 @@ extern int ZEXPORT unzGetCurrentFileInfo (unzFile file, pfile_info->tmu_date = file_info64.tmu_date, - pfile_info->compressed_size = (uLong)file_info64.compressed_size; pfile_info->uncompressed_size = (uLong)file_info64.uncompressed_size; @@ -1212,7 +1184,6 @@ extern int ZEXPORT unzGoToNextFile (unzFile file) return err; } - /* Try locate the file szFileName in the zipfile. For the iCaseSensitivity signification, see unzStringFileNameCompare @@ -1234,7 +1205,6 @@ extern int ZEXPORT unzLocateFile (unzFile file, const char *szFileName, int iCas ZPOS64_T num_fileSaved; ZPOS64_T pos_in_central_dirSaved; - if (file==NULL) return UNZ_PARAMERROR; @@ -1278,7 +1248,6 @@ extern int ZEXPORT unzLocateFile (unzFile file, const char *szFileName, int iCas return err; } - /* /////////////////////////////////////////// // Contributed by Ryan Haksi (mailto://[email protected]) @@ -1391,7 +1360,6 @@ local int unz64local_CheckCurrentFileCoherencyHeader (unz64_s* s, uInt* piSizeVa s->byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET)!=0) return UNZ_ERRNO; - if (err==UNZ_OK) { if (unz64local_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK) @@ -1594,7 +1562,6 @@ extern int ZEXPORT unzOpenCurrentFile3 (unzFile file, int* method, pfile_in_zip_read_info->rest_read_uncompressed = s->cur_file_info.uncompressed_size ; - pfile_in_zip_read_info->pos_in_zipfile = s->cur_file_info_internal.offset_curfile + SIZEZIPLOCALHEADER + iSizeVar; @@ -1626,7 +1593,6 @@ extern int ZEXPORT unzOpenCurrentFile3 (unzFile file, int* method, } # endif - return UNZ_OK; } @@ -1687,7 +1653,6 @@ extern int ZEXPORT unzReadCurrentFile (unzFile file, voidp buf, unsigned len) if (pfile_in_zip_read_info==NULL) return UNZ_PARAMERROR; - if (pfile_in_zip_read_info->read_buffer == NULL) return UNZ_END_OF_LIST_OF_FILE; if (len==0) @@ -1731,7 +1696,6 @@ extern int ZEXPORT unzReadCurrentFile (unzFile file, voidp buf, unsigned len) uReadThis)!=uReadThis) return UNZ_ERRNO; - # ifndef NOUNCRYPT if(s->encrypted) { @@ -1743,7 +1707,6 @@ extern int ZEXPORT unzReadCurrentFile (unzFile file, voidp buf, unsigned len) } # endif - pfile_in_zip_read_info->pos_in_zipfile += uReadThis; pfile_in_zip_read_info->rest_read_compressed-=uReadThis; @@ -1874,7 +1837,6 @@ extern int ZEXPORT unzReadCurrentFile (unzFile file, voidp buf, unsigned len) return err; } - /* Give the current position in uncompressed data */ @@ -1909,7 +1871,6 @@ extern ZPOS64_T ZEXPORT unztell64 (unzFile file) return pfile_in_zip_read_info->total_out_64; } - /* return 1 if the end of file was reached, 0 elsewhere */ @@ -1931,8 +1892,6 @@ extern int ZEXPORT unzeof (unzFile file) return 0; } - - /* Read extra field from the current file (opened by unzOpenCurrentFile) This is the local-header version of the extra field (sometimes, there is @@ -2007,7 +1966,6 @@ extern int ZEXPORT unzCloseCurrentFile (unzFile file) if (pfile_in_zip_read_info==NULL) return UNZ_PARAMERROR; - if ((pfile_in_zip_read_info->rest_read_uncompressed == 0) && (!pfile_in_zip_read_info->raw)) { @@ -2015,7 +1973,6 @@ extern int ZEXPORT unzCloseCurrentFile (unzFile file) err=UNZ_CRCERROR; } - TRYFREE(pfile_in_zip_read_info->read_buffer); pfile_in_zip_read_info->read_buffer = NULL; if (pfile_in_zip_read_info->stream_initialised == Z_DEFLATED) @@ -2025,7 +1982,6 @@ extern int ZEXPORT unzCloseCurrentFile (unzFile file) BZ2_bzDecompressEnd(&pfile_in_zip_read_info->bstream); #endif - pfile_in_zip_read_info->stream_initialised = 0; TRYFREE(pfile_in_zip_read_info); @@ -2034,7 +1990,6 @@ extern int ZEXPORT unzCloseCurrentFile (unzFile file) return err; } - /* Get the global comment string of the ZipFile, in the szComment buffer. uSizeBuf is the size of the szComment buffer. diff --git a/backend/epub/minizip/unzip.h b/backend/epub/minizip/unzip.h index 2104e391..5c5a3f99 100644 --- a/backend/epub/minizip/unzip.h +++ b/backend/epub/minizip/unzip.h @@ -70,7 +70,6 @@ typedef unzFile__ *unzFile; typedef voidp unzFile; #endif - #define UNZ_OK (0) #define UNZ_END_OF_LIST_OF_FILE (-100) #define UNZ_ERRNO (Z_ERRNO) @@ -162,7 +161,6 @@ extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1, (like 1 on Unix, 2 on Windows) */ - extern unzFile ZEXPORT unzOpen OF((const char *path)); extern unzFile ZEXPORT unzOpen64 OF((const void *path)); /* @@ -180,7 +178,6 @@ extern unzFile ZEXPORT unzOpen64 OF((const void *path)); does not describe the reality */ - extern unzFile ZEXPORT unzOpen2 OF((const char *path, zlib_filefunc_def* pzlib_filefunc_def)); /* @@ -212,7 +209,6 @@ extern int ZEXPORT unzGetGlobalInfo64 OF((unzFile file, No preparation of the structure is needed return UNZ_OK if there is no problem. */ - extern int ZEXPORT unzGetGlobalComment OF((unzFile file, char *szComment, uLong uSizeBuf)); @@ -222,7 +218,6 @@ extern int ZEXPORT unzGetGlobalComment OF((unzFile file, return the number of byte copied or an error code <0 */ - /***************************************************************************/ /* Unzip package allow you browse the directory of the zipfile */ @@ -251,7 +246,6 @@ extern int ZEXPORT unzLocateFile OF((unzFile file, UNZ_END_OF_LIST_OF_FILE if the file is not found */ - /* ****************************************** */ /* Ryan supplied functions */ /* unz_file_info contain information about a file in the zipfile */ @@ -315,14 +309,12 @@ extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file, (commentBufferSize is the size of the buffer) */ - /** Addition for GDAL : START */ extern ZPOS64_T ZEXPORT unzGetCurrentFileZStreamPos64 OF((unzFile file)); /** Addition for GDAL : END */ - /***************************************************************************/ /* for reading the content of the current zipfile, you can open it, read data from it, and close it (you can close it before reading all the file) @@ -369,7 +361,6 @@ extern int ZEXPORT unzOpenCurrentFile3 OF((unzFile file, but you CANNOT set method parameter as NULL */ - extern int ZEXPORT unzCloseCurrentFile OF((unzFile file)); /* Close the file in zip opened with unzOpenCurrentFile @@ -428,8 +419,6 @@ extern uLong ZEXPORT unzGetOffset (unzFile file); extern int ZEXPORT unzSetOffset64 (unzFile file, ZPOS64_T pos); extern int ZEXPORT unzSetOffset (unzFile file, uLong pos); - - #ifdef __cplusplus } #endif diff --git a/backend/pdf/ev-poppler.h b/backend/pdf/ev-poppler.h index c70fc7d0..8f98fa02 100644 --- a/backend/pdf/ev-poppler.h +++ b/backend/pdf/ev-poppler.h @@ -34,7 +34,6 @@ GType pdf_document_get_type (void) G_GNUC_CONST; G_MODULE_EXPORT GType register_atril_backend (GTypeModule *module); - G_END_DECLS #endif /* __PDF_DOCUMENT_H__ */ diff --git a/backend/pixbuf/pixbuf-document.c b/backend/pixbuf/pixbuf-document.c index a4fe88ed..92bc7097 100644 --- a/backend/pixbuf/pixbuf-document.c +++ b/backend/pixbuf/pixbuf-document.c @@ -201,7 +201,6 @@ pixbuf_document_document_thumbnails_iface_init (EvDocumentThumbnailsInterface *i iface->get_dimensions = pixbuf_document_thumbnails_get_dimensions; } - static void pixbuf_document_init (PixbufDocument *pixbuf_document) { diff --git a/backend/tiff/tiff-document.c b/backend/tiff/tiff-document.c index 2129de20..c47be57f 100644 --- a/backend/tiff/tiff-document.c +++ b/backend/tiff/tiff-document.c @@ -361,7 +361,6 @@ tiff_document_render_pixbuf (EvDocument *document, if (width <= 0 || height <= 0) return NULL; - if (width >= INT_MAX / 4) /* overflow */ return NULL; diff --git a/backend/tiff/tiff2ps.c b/backend/tiff/tiff2ps.c index bcbbf885..41f2fb9a 100644 --- a/backend/tiff/tiff2ps.c +++ b/backend/tiff/tiff2ps.c @@ -449,7 +449,6 @@ PlaceImage(TIFF2PSContext *ctx, double pagewidth, double pageheight, return splitpage; } - void tiff2ps_process_page(TIFF2PSContext* ctx, TIFF* tif, double pw, double ph, double lm, double bm, gboolean cnt) @@ -592,7 +591,6 @@ tiff2ps_process_page(TIFF2PSContext* ctx, TIFF* tif, double pw, double ph, } } - static char DuplexPreamble[] = "\ %%BeginFeature: *Duplex True\n\ systemdict begin\n\ diff --git a/backend/xps/xps-document.c b/backend/xps/xps-document.c index 8db7d56c..e7e9ef2b 100644 --- a/backend/xps/xps-document.c +++ b/backend/xps/xps-document.c @@ -176,7 +176,6 @@ xps_document_get_info (EvDocument *document) EV_DOCUMENT_INFO_N_PAGES | EV_DOCUMENT_INFO_PAPER_SIZE; - if (gxps_document_get_n_pages (xps->doc) > 0) { ev_document_get_page_size (document, 0, &(info->paper_width), @@ -483,7 +482,6 @@ xps_document_document_links_iface_init (EvDocumentLinksInterface *iface) iface->find_link_page = xps_document_links_find_link_page; } - /* EvDocumentPrint */ static void xps_document_print_print_page (EvDocumentPrint *document, diff --git a/cut-n-paste/toolbar-editor/egg-editable-toolbar.c b/cut-n-paste/toolbar-editor/egg-editable-toolbar.c index 91a065ed..e4c2f570 100644 --- a/cut-n-paste/toolbar-editor/egg-editable-toolbar.c +++ b/cut-n-paste/toolbar-editor/egg-editable-toolbar.c @@ -541,7 +541,6 @@ configure_item_cursor (GtkToolItem *item, } } - static void configure_item_tooltip (GtkToolItem *item) { @@ -557,7 +556,6 @@ configure_item_tooltip (GtkToolItem *item) } } - static void connect_widget_signals (GtkWidget *proxy, EggEditableToolbar *etoolbar) { diff --git a/cut-n-paste/toolbar-editor/egg-toolbar-editor.c b/cut-n-paste/toolbar-editor/egg-toolbar-editor.c index 312b9128..551bbde3 100644 --- a/cut-n-paste/toolbar-editor/egg-toolbar-editor.c +++ b/cut-n-paste/toolbar-editor/egg-toolbar-editor.c @@ -36,7 +36,6 @@ static const GtkTargetEntry source_drag_types[] = { {EGG_TOOLBAR_ITEM_TYPE, GTK_TARGET_SAME_APP, 0}, }; - static void egg_toolbar_editor_finalize (GObject *object); static void update_editor_sheet (EggToolbarEditor *editor); diff --git a/cut-n-paste/toolbar-editor/egg-toolbar-editor.h b/cut-n-paste/toolbar-editor/egg-toolbar-editor.h index e5a10b0a..13154808 100644 --- a/cut-n-paste/toolbar-editor/egg-toolbar-editor.h +++ b/cut-n-paste/toolbar-editor/egg-toolbar-editor.h @@ -34,7 +34,6 @@ typedef struct EggToolbarEditorClass EggToolbarEditorClass; #define EGG_IS_TOOLBAR_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_TOOLBAR_EDITOR)) #define EGG_TOOLBAR_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYPE_TOOLBAR_EDITOR, EggToolbarEditorClass)) - typedef struct EggToolbarEditor EggToolbarEditor; typedef struct EggToolbarEditorPrivate EggToolbarEditorPrivate; @@ -51,7 +50,6 @@ struct EggToolbarEditorClass GtkBoxClass parent_class; }; - GType egg_toolbar_editor_get_type (void); GtkWidget *egg_toolbar_editor_new (GtkUIManager *manager, EggToolbarsModel *model); diff --git a/cut-n-paste/toolbar-editor/egg-toolbars-model.c b/cut-n-paste/toolbar-editor/egg-toolbars-model.c index f3cc8022..ebf72b74 100644 --- a/cut-n-paste/toolbar-editor/egg-toolbars-model.c +++ b/cut-n-paste/toolbar-editor/egg-toolbars-model.c @@ -213,7 +213,6 @@ is_unique (EggToolbarsModel *model, EggToolbarsItem *idata2; GNode *toolbar, *item; - for(toolbar = g_node_first_child (model->priv->toolbars); toolbar != NULL; toolbar = g_node_next_sibling (toolbar)) { @@ -330,7 +329,6 @@ egg_toolbars_model_set_flags (EggToolbarsModel *model, 0, toolbar_position); } - char * egg_toolbars_model_get_data (EggToolbarsModel *model, GdkAtom type, diff --git a/cut-n-paste/zoom-control/ephy-zoom.c b/cut-n-paste/zoom-control/ephy-zoom.c index 9c289f2c..c462bb4b 100644 --- a/cut-n-paste/zoom-control/ephy-zoom.c +++ b/cut-n-paste/zoom-control/ephy-zoom.c @@ -54,7 +54,6 @@ ephy_zoom_get_zoom_level_index (float level) return n_zoom_levels - 1; } - float ephy_zoom_get_changed_zoom_level (float level, gint steps) { diff --git a/libdocument/ev-document-attachments.c b/libdocument/ev-document-attachments.c index 6b1b695f..cdc840d5 100644 --- a/libdocument/ev-document-attachments.c +++ b/libdocument/ev-document-attachments.c @@ -52,4 +52,3 @@ ev_document_attachments_get_attachments (EvDocumentAttachments *document_attachm return iface->get_attachments (document_attachments); } - diff --git a/libdocument/ev-document-factory.c b/libdocument/ev-document-factory.c index 82286829..4d07f065 100644 --- a/libdocument/ev-document-factory.c +++ b/libdocument/ev-document-factory.c @@ -106,7 +106,6 @@ get_compression_from_mime_type (const gchar *mime_type) return EV_COMPRESSION_NONE; } - /* * get_document_from_uri: * @uri: the document URI diff --git a/libdocument/ev-document-fonts.h b/libdocument/ev-document-fonts.h index 6251644a..bd5d4220 100644 --- a/libdocument/ev-document-fonts.h +++ b/libdocument/ev-document-fonts.h @@ -37,7 +37,6 @@ G_BEGIN_DECLS - #define EV_TYPE_DOCUMENT_FONTS (ev_document_fonts_get_type ()) #define EV_DOCUMENT_FONTS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EV_TYPE_DOCUMENT_FONTS, EvDocumentFonts)) #define EV_DOCUMENT_FONTS_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EV_TYPE_DOCUMENT_FONTS, EvDocumentFontsInterface)) diff --git a/libdocument/ev-document-misc.c b/libdocument/ev-document-misc.c index 80948936..06dce9c5 100644 --- a/libdocument/ev-document-misc.c +++ b/libdocument/ev-document-misc.c @@ -149,7 +149,6 @@ ev_document_misc_get_page_border_size (gint page_width, } } - void ev_document_misc_paint_one_page (cairo_t *cr, GtkWidget *widget, diff --git a/libdocument/ev-document-security.h b/libdocument/ev-document-security.h index 1f411562..beef49af 100644 --- a/libdocument/ev-document-security.h +++ b/libdocument/ev-document-security.h @@ -35,7 +35,6 @@ G_BEGIN_DECLS - #define EV_TYPE_DOCUMENT_SECURITY (ev_document_security_get_type ()) #define EV_DOCUMENT_SECURITY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EV_TYPE_DOCUMENT_SECURITY, EvDocumentSecurity)) #define EV_DOCUMENT_SECURITY_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EV_TYPE_DOCUMENT_SECURITY, EvDocumentSecurityInterface)) diff --git a/libdocument/ev-document-text.c b/libdocument/ev-document-text.c index 8fdc916c..072782f6 100644 --- a/libdocument/ev-document-text.c +++ b/libdocument/ev-document-text.c @@ -42,7 +42,6 @@ ev_document_text_get_text (EvDocumentText *document_text, return iface->get_text (document_text, page); } - gboolean ev_document_text_get_text_layout (EvDocumentText *document_text, EvPage *page, diff --git a/libdocument/ev-document.c b/libdocument/ev-document.c index f7c87895..96b80946 100644 --- a/libdocument/ev-document.c +++ b/libdocument/ev-document.c @@ -388,7 +388,6 @@ ev_document_get_page (EvDocument *document, return klass->get_page (document, index); } - #ifdef ENABLE_SYNCTEX static gboolean _ev_document_support_synctex (EvDocument *document) diff --git a/libdocument/ev-file-helpers.h b/libdocument/ev-file-helpers.h index 0a6ff7e0..d55ef267 100644 --- a/libdocument/ev-file-helpers.h +++ b/libdocument/ev-file-helpers.h @@ -66,7 +66,6 @@ gchar *ev_file_compress (const gchar *uri, EvCompressionType type, GError **error); - G_END_DECLS #endif /* EV_FILE_HELPERS_H */ diff --git a/libdocument/ev-form-field.h b/libdocument/ev-form-field.h index c0795463..45db85d9 100644 --- a/libdocument/ev-form-field.h +++ b/libdocument/ev-form-field.h @@ -209,7 +209,6 @@ EvFormField *ev_form_field_choice_new (gint id, GType ev_form_field_signature_get_type (void) G_GNUC_CONST; EvFormField *ev_form_field_signature_new (gint id); - G_END_DECLS #endif /* !EV_FORM_FIELD_H */ diff --git a/libdocument/ev-image.h b/libdocument/ev-image.h index 738b7fd5..899d502f 100644 --- a/libdocument/ev-image.h +++ b/libdocument/ev-image.h @@ -62,7 +62,6 @@ const gchar *ev_image_save_tmp (EvImage *image, GdkPixbuf *pixbuf); const gchar *ev_image_get_tmp_uri (EvImage *image); - G_END_DECLS #endif /* __EV_IMAGE_H__ */ diff --git a/libdocument/ev-render-context.h b/libdocument/ev-render-context.h index 4366842d..e071cb01 100644 --- a/libdocument/ev-render-context.h +++ b/libdocument/ev-render-context.h @@ -52,7 +52,6 @@ struct _EvRenderContext gdouble scale; }; - GType ev_render_context_get_type (void) G_GNUC_CONST; EvRenderContext *ev_render_context_new (EvPage *page, gint rotation, @@ -64,7 +63,6 @@ void ev_render_context_set_rotation (EvRenderContext *rc, void ev_render_context_set_scale (EvRenderContext *rc, gdouble scale); - G_END_DECLS #endif /* !EV_RENDER_CONTEXT */ diff --git a/libdocument/ev-transition-effect.h b/libdocument/ev-transition-effect.h index b9d00c0b..5cb91dd1 100644 --- a/libdocument/ev-transition-effect.h +++ b/libdocument/ev-transition-effect.h @@ -61,7 +61,6 @@ typedef enum { EV_TRANSITION_DIRECTION_OUTWARD } EvTransitionEffectDirection; - typedef struct EvTransitionEffect EvTransitionEffect; typedef struct EvTransitionEffectClass EvTransitionEffectClass; @@ -75,7 +74,6 @@ struct EvTransitionEffectClass GObjectClass parent_class; }; - GType ev_transition_effect_get_type (void) G_GNUC_CONST; EvTransitionEffect *ev_transition_effect_new (EvTransitionEffectType type, diff --git a/libmisc/ev-page-action-widget.c b/libmisc/ev-page-action-widget.c index cf3b6a6a..c24d9b97 100644 --- a/libmisc/ev-page-action-widget.c +++ b/libmisc/ev-page-action-widget.c @@ -305,7 +305,6 @@ match_selected_cb (GtkEntryCompletion *completion, return TRUE; } - static void display_completion_text (GtkCellLayout *cell_layout, GtkCellRenderer *renderer, @@ -349,7 +348,6 @@ match_completion (GtkEntryCompletion *completion, EV_DOCUMENT_LINKS_COLUMN_LINK, &link, -1); - if (link) { text = ev_link_get_title (link); g_object_unref (link); @@ -445,7 +443,6 @@ get_filter_model_from_model (GtkTreeModel *model) return filter_model; } - void ev_page_action_widget_update_links_model (EvPageActionWidget *proxy, GtkTreeModel *model) { diff --git a/libview/ev-page-accessible.c b/libview/ev-page-accessible.c index fba189c5..112f8020 100644 --- a/libview/ev-page-accessible.c +++ b/libview/ev-page-accessible.c @@ -37,7 +37,6 @@ struct _EvPageAccessiblePrivate { gboolean children_initialized; }; - enum { PROP_0, PROP_VIEW_ACCESSIBLE, @@ -412,7 +411,6 @@ treat_as_soft_return (EvView *view, EvRectangle *next_word_end; gint prev_offset, next_offset; - if (!log_attrs[offset].is_white) return FALSE; diff --git a/libview/ev-pixbuf-cache.c b/libview/ev-pixbuf-cache.c index 3c034343..163267f6 100644 --- a/libview/ev-pixbuf-cache.c +++ b/libview/ev-pixbuf-cache.c @@ -72,7 +72,6 @@ struct _EvPixbufCacheClass void (* job_finished) (EvPixbufCache *pixbuf_cache); }; - enum { JOB_FINISHED, @@ -92,7 +91,6 @@ static gboolean new_selection_surface_needed(EvPixbufCache *pixbuf_cac gint page, gfloat scale); - /* These are used for iterating through the prev and next arrays */ #define FIRST_VISIBLE_PREV(pixbuf_cache) \ (MAX (0, pixbuf_cache->preload_cache_size - pixbuf_cache->start_page)) @@ -223,7 +221,6 @@ ev_pixbuf_cache_dispose (GObject *object) G_OBJECT_CLASS (ev_pixbuf_cache_parent_class)->dispose (object); } - EvPixbufCache * ev_pixbuf_cache_new (GtkWidget *view, EvDocumentModel *model, @@ -985,7 +982,6 @@ ev_pixbuf_cache_clear (EvPixbufCache *pixbuf_cache) } } - void ev_pixbuf_cache_style_changed (EvPixbufCache *pixbuf_cache) { @@ -1265,7 +1261,6 @@ ev_pixbuf_cache_set_selection_list (EvPixbufCache *pixbuf_cache, } } - /* Returns what the pixbuf cache thinks is */ GList * @@ -1356,4 +1351,3 @@ ev_pixbuf_cache_reload_page (EvPixbufCache *pixbuf_cache, EV_JOB_PRIORITY_URGENT); } - diff --git a/libview/ev-pixbuf-cache.h b/libview/ev-pixbuf-cache.h index 5617ca9b..941e6862 100644 --- a/libview/ev-pixbuf-cache.h +++ b/libview/ev-pixbuf-cache.h @@ -39,8 +39,6 @@ G_BEGIN_DECLS #define EV_PIXBUF_CACHE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EV_TYPE_PIXBUF_CACHE, EvPixbufCache)) #define EV_IS_PIXBUF_CACHE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EV_TYPE_PIXBUF_CACHE)) - - /* The coordinates in the rect here are at scale == 1.0, so that we can ignore * resizings. There is one per page, maximum. */ diff --git a/libview/ev-timeline.c b/libview/ev-timeline.c index ce4153dc..c794a438 100644 --- a/libview/ev-timeline.c +++ b/libview/ev-timeline.c @@ -56,10 +56,8 @@ enum { static guint signals [LAST_SIGNAL] = { 0, }; - G_DEFINE_TYPE_WITH_PRIVATE (EvTimeline, ev_timeline, G_TYPE_OBJECT) - static void ev_timeline_init (EvTimeline *timeline) { diff --git a/libview/ev-timeline.h b/libview/ev-timeline.h index d4f6ba78..4a2c86a9 100644 --- a/libview/ev-timeline.h +++ b/libview/ev-timeline.h @@ -59,7 +59,6 @@ struct EvTimelineClass { gdouble progress); }; - GType ev_timeline_get_type (void) G_GNUC_CONST; EvTimeline *ev_timeline_new (guint duration); @@ -84,7 +83,6 @@ void ev_timeline_set_duration (EvTimeline *ti gdouble ev_timeline_get_progress (EvTimeline *timeline); - G_END_DECLS #endif /* __EV_TIMELINE_H__ */ diff --git a/libview/ev-transition-animation.c b/libview/ev-transition-animation.c index f41aa85c..8589e1b4 100644 --- a/libview/ev-transition-animation.c +++ b/libview/ev-transition-animation.c @@ -41,10 +41,8 @@ enum { PROP_DEST_SURFACE }; - G_DEFINE_TYPE_WITH_PRIVATE (EvTransitionAnimation, ev_transition_animation, EV_TYPE_TIMELINE) - static void ev_transition_animation_init (EvTransitionAnimation *animation) { diff --git a/libview/ev-transition-animation.h b/libview/ev-transition-animation.h index 8691fd66..f6e374f4 100644 --- a/libview/ev-transition-animation.h +++ b/libview/ev-transition-animation.h @@ -50,7 +50,6 @@ struct EvTransitionAnimationClass { EvTimelineClass parent_class; }; - GType ev_transition_animation_get_type (void) G_GNUC_CONST; EvTransitionAnimation * ev_transition_animation_new (EvTransitionEffect *effect); @@ -67,7 +66,6 @@ void ev_transition_animation_paint (EvTransition GdkRectangle page_area); gboolean ev_transition_animation_ready (EvTransitionAnimation *animation); - G_END_DECLS #endif /* __EV_TRANSITION_ANIMATION_H__ */ diff --git a/libview/ev-view-presentation.c b/libview/ev-view-presentation.c index c525e51f..ac723eb2 100644 --- a/libview/ev-view-presentation.c +++ b/libview/ev-view-presentation.c @@ -1385,7 +1385,6 @@ ev_view_presentation_scroll_event (GtkWidget *widget, return TRUE; } - static void add_change_page_binding_keypad (GtkBindingSet *binding_set, guint keyval, diff --git a/libview/ev-view.c b/libview/ev-view.c index 2e01035e..86c83944 100644 --- a/libview/ev-view.c +++ b/libview/ev-view.c @@ -5621,7 +5621,6 @@ ev_view_style_updated (GtkWidget *widget) /*** Drawing ***/ - static void draw_rubberband (EvView *view, cairo_t *cr, @@ -5652,7 +5651,6 @@ draw_rubberband (EvView *view, cairo_restore (cr); } - static void highlight_find_results (EvView *view, cairo_t *cr, int page) { diff --git a/libview/ev-web-view.c b/libview/ev-web-view.c index ecd7a02b..7c6c83f3 100644 --- a/libview/ev-web-view.c +++ b/libview/ev-web-view.c @@ -31,7 +31,6 @@ #include "ev-document-model.h" #include "ev-jobs.h" - typedef enum { EV_WEB_VIEW_FIND_NEXT, EV_WEB_VIEW_FIND_PREV @@ -322,7 +321,6 @@ ev_web_view_reload (EvWebView *webview) web_view_update_range_and_current_page (webview); } - gboolean ev_web_view_next_page (EvWebView *webview) { diff --git a/libview/ev-web-view.h b/libview/ev-web-view.h index 16b82ba8..02f7ef64 100644 --- a/libview/ev-web-view.h +++ b/libview/ev-web-view.h @@ -35,7 +35,6 @@ #include <glib-object.h> G_BEGIN_DECLS - typedef struct _EvWebView EvWebView; typedef struct _EvWebViewClass EvWebViewClass; diff --git a/previewer/ev-previewer-window.c b/previewer/ev-previewer-window.c index b10015f3..9f61d8b5 100644 --- a/previewer/ev-previewer-window.c +++ b/previewer/ev-previewer-window.c @@ -621,7 +621,6 @@ ev_previewer_window_constructor (GType type, return object; } - static void ev_previewer_window_class_init (EvPreviewerWindowClass *klass) { diff --git a/shell/eggfindbar.c b/shell/eggfindbar.c index 438c5dc7..13d7feb8 100644 --- a/shell/eggfindbar.c +++ b/shell/eggfindbar.c @@ -573,7 +573,6 @@ egg_find_bar_set_search_string (EggFindBar *find_bar, g_object_thaw_notify (G_OBJECT (find_bar)); } - /** * egg_find_bar_get_search_string: * diff --git a/shell/eggfindbar.h b/shell/eggfindbar.h index df7157e1..5f41cc17 100644 --- a/shell/eggfindbar.h +++ b/shell/eggfindbar.h @@ -77,4 +77,3 @@ G_END_DECLS #endif /* __EGG_FIND_BAR_H__ */ - diff --git a/shell/ev-application.c b/shell/ev-application.c index 8cff194f..56279aca 100644 --- a/shell/ev-application.c +++ b/shell/ev-application.c @@ -21,7 +21,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - #include <config.h> #include <stdlib.h> #include <string.h> @@ -311,7 +310,6 @@ ev_application_get_empty_window (EvApplication *application, return empty_window; } - #ifdef ENABLE_DBUS typedef struct { gchar *uri; diff --git a/shell/ev-bookmarks.h b/shell/ev-bookmarks.h index d15ebad9..ac6ef524 100644 --- a/shell/ev-bookmarks.h +++ b/shell/ev-bookmarks.h @@ -50,8 +50,6 @@ void ev_bookmarks_delete (EvBookmarks *bookmarks, void ev_bookmarks_update (EvBookmarks *bookmarks, EvBookmark *bookmark); - - G_END_DECLS #endif /* EV_BOOKMARKS_H */ diff --git a/shell/ev-daemon.c b/shell/ev-daemon.c index a45adefb..bf552f5d 100644 --- a/shell/ev-daemon.c +++ b/shell/ev-daemon.c @@ -43,7 +43,6 @@ #define LOG g_debug - #define EV_TYPE_DAEMON_APPLICATION (ev_daemon_application_get_type ()) #define EV_DAEMON_APPLICATION(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), EV_TYPE_DAEMON_APPLICATION, EvDaemonApplication)) diff --git a/shell/ev-history.c b/shell/ev-history.c index 940c66f9..7fc3c824 100644 --- a/shell/ev-history.c +++ b/shell/ev-history.c @@ -24,7 +24,6 @@ #include "ev-history.h" - enum { HISTORY_CHANGED, diff --git a/shell/ev-loading-message.c b/shell/ev-loading-message.c index aa7014e5..530f4e73 100644 --- a/shell/ev-loading-message.c +++ b/shell/ev-loading-message.c @@ -174,4 +174,3 @@ ev_loading_message_new (void) return message; } - diff --git a/shell/ev-media-player-keys.h b/shell/ev-media-player-keys.h index f18f192a..fb69aa47 100644 --- a/shell/ev-media-player-keys.h +++ b/shell/ev-media-player-keys.h @@ -37,7 +37,6 @@ G_BEGIN_DECLS typedef struct _EvMediaPlayerKeys EvMediaPlayerKeys; typedef struct _EvMediaPlayerKeysClass EvMediaPlayerKeysClass; - GType ev_media_player_keys_get_type (void) G_GNUC_CONST; EvMediaPlayerKeys *ev_media_player_keys_new (void); diff --git a/shell/ev-navigation-action.c b/shell/ev-navigation-action.c index 57b4c463..e3ba10a2 100644 --- a/shell/ev-navigation-action.c +++ b/shell/ev-navigation-action.c @@ -26,7 +26,6 @@ #include "ev-navigation-action.h" #include "ev-navigation-action-widget.h" - enum { WIDGET_ACTIVATE_LINK, diff --git a/shell/ev-open-recent-action.c b/shell/ev-open-recent-action.c index 0c1a21dc..3186f261 100644 --- a/shell/ev-open-recent-action.c +++ b/shell/ev-open-recent-action.c @@ -24,7 +24,6 @@ #include "ev-open-recent-action.h" - enum { ITEM_ACTIVATED, N_SIGNALS diff --git a/shell/ev-password-view.c b/shell/ev-password-view.c index e720a7f5..601a5e5e 100644 --- a/shell/ev-password-view.c +++ b/shell/ev-password-view.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -47,7 +46,6 @@ struct _EvPasswordViewPrivate { static guint password_view_signals [LAST_SIGNAL] = { 0 }; - G_DEFINE_TYPE_WITH_PRIVATE (EvPasswordView, ev_password_view, GTK_TYPE_VIEWPORT) static void diff --git a/shell/ev-sidebar-attachments.c b/shell/ev-sidebar-attachments.c index 81aee149..007322f4 100644 --- a/shell/ev-sidebar-attachments.c +++ b/shell/ev-sidebar-attachments.c @@ -631,7 +631,6 @@ job_finished_callback (EvJobAttachments *job, g_object_unref (job); } - static void ev_sidebar_attachments_document_changed_cb (EvDocumentModel *model, GParamSpec *pspec, diff --git a/shell/ev-sidebar-bookmarks.c b/shell/ev-sidebar-bookmarks.c index 2abdd695..214ca61a 100644 --- a/shell/ev-sidebar-bookmarks.c +++ b/shell/ev-sidebar-bookmarks.c @@ -122,7 +122,6 @@ ev_bookmarks_popup_cmd_rename_bookmark (GtkAction *action, GtkTreeModel *model; GtkTreeIter iter; - selection = gtk_tree_view_get_selection (tree_view); if (gtk_tree_selection_get_selected (selection, &model, &iter)) { GtkTreePath *path; diff --git a/shell/ev-sidebar-layers.c b/shell/ev-sidebar-layers.c index 1326e381..5518f4a9 100644 --- a/shell/ev-sidebar-layers.c +++ b/shell/ev-sidebar-layers.c @@ -239,7 +239,6 @@ ev_sidebar_layers_create_tree_view (EvSidebarLayers *ev_layers) gtk_tree_selection_set_mode (gtk_tree_view_get_selection (tree_view), GTK_SELECTION_NONE); - column = gtk_tree_view_column_new (); renderer = gtk_cell_renderer_toggle_new (); diff --git a/shell/ev-sidebar-links.c b/shell/ev-sidebar-links.c index 7acbff7c..867408b4 100644 --- a/shell/ev-sidebar-links.c +++ b/shell/ev-sidebar-links.c @@ -379,7 +379,6 @@ button_press_cb (GtkWidget *treeview, return FALSE; } - static void ev_sidebar_links_construct (EvSidebarLinks *ev_sidebar_links) { @@ -425,7 +424,6 @@ ev_sidebar_links_construct (EvSidebarLinks *ev_sidebar_links) "markup", EV_DOCUMENT_LINKS_COLUMN_MARKUP, NULL); - renderer = gtk_cell_renderer_text_new (); gtk_tree_view_column_pack_end (GTK_TREE_VIEW_COLUMN (column), renderer, FALSE); gtk_tree_view_column_set_attributes (GTK_TREE_VIEW_COLUMN (column), renderer, @@ -566,7 +564,6 @@ expand_open_links (GtkTreeView *tree_view, GtkTreeModel *model, GtkTreeIter *par } } - static gint page_link_tree_sort (gconstpointer a, gconstpointer b, void *data) { diff --git a/shell/ev-sidebar-links.h b/shell/ev-sidebar-links.h index eb4ae8ff..d0475dc5 100644 --- a/shell/ev-sidebar-links.h +++ b/shell/ev-sidebar-links.h @@ -63,4 +63,3 @@ G_END_DECLS #endif /* __EV_SIDEBAR_LINKS_H__ */ - diff --git a/shell/ev-sidebar-page.c b/shell/ev-sidebar-page.c index 0b216bd8..bd5b85c2 100644 --- a/shell/ev-sidebar-page.c +++ b/shell/ev-sidebar-page.c @@ -74,7 +74,6 @@ ev_sidebar_page_get_label (EvSidebarPage *sidebar_page) return iface->get_label (sidebar_page); } - static void ev_sidebar_page_default_init (EvSidebarPageInterface *iface) { diff --git a/shell/ev-sidebar-page.h b/shell/ev-sidebar-page.h index 21ef92cf..21791aaa 100644 --- a/shell/ev-sidebar-page.h +++ b/shell/ev-sidebar-page.h @@ -58,7 +58,6 @@ void ev_sidebar_page_set_model (EvSidebarPage *sidebar_page, EvDocumentModel *model); const gchar* ev_sidebar_page_get_label (EvSidebarPage *page); - G_END_DECLS #endif /* EV_SIDEBAR_PAGE */ diff --git a/shell/ev-sidebar-thumbnails.c b/shell/ev-sidebar-thumbnails.c index 05a9049f..11e43267 100644 --- a/shell/ev-sidebar-thumbnails.c +++ b/shell/ev-sidebar-thumbnails.c @@ -245,7 +245,6 @@ ev_thumbnails_size_cache_get (EvDocument *document) return cache; } - static void ev_sidebar_thumbnails_dispose (GObject *object) { diff --git a/shell/ev-sidebar-thumbnails.h b/shell/ev-sidebar-thumbnails.h index ed10ac39..3a0186cd 100644 --- a/shell/ev-sidebar-thumbnails.h +++ b/shell/ev-sidebar-thumbnails.h @@ -56,4 +56,3 @@ G_END_DECLS #endif /* __EV_SIDEBAR_THUMBNAILS_H__ */ - diff --git a/shell/ev-sidebar.c b/shell/ev-sidebar.c index 0cdb6be8..6a82ad9a 100644 --- a/shell/ev-sidebar.c +++ b/shell/ev-sidebar.c @@ -446,7 +446,6 @@ ev_sidebar_add_page (EvSidebar *ev_sidebar, gtk_list_store_move_before(GTK_LIST_STORE(ev_sidebar->priv->page_model), &iter, NULL); - /* Set the first item added as active */ gtk_tree_model_get_iter_first (ev_sidebar->priv->page_model, &iter); gtk_tree_model_get (ev_sidebar->priv->page_model, diff --git a/shell/ev-sidebar.h b/shell/ev-sidebar.h index 11d16632..20a73e3a 100644 --- a/shell/ev-sidebar.h +++ b/shell/ev-sidebar.h @@ -64,4 +64,3 @@ G_END_DECLS #endif /* __EV_SIDEBAR_H__ */ - diff --git a/shell/ev-window.c b/shell/ev-window.c index f520ae88..f1fe7616 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -418,7 +418,6 @@ ev_window_set_action_sensitive (EvWindow *ev_window, G_GNUC_END_IGNORE_DEPRECATIONS; } - static void ev_window_setup_action_sensitivity (EvWindow *ev_window) { @@ -1555,7 +1554,6 @@ ev_window_setup_default (EvWindow *ev_window) ev_document_model_set_scale (model, g_settings_get_double (settings, "zoom")); } - static void ev_window_clear_thumbnail_job (EvWindow *ev_window) { @@ -3649,7 +3647,6 @@ ev_window_print_operation_done (EvPrintOperation *op, GtkWidget *dialog; GError *error = NULL; - ev_print_operation_get_error (op, &error); /* The message area is already used by @@ -3904,7 +3901,6 @@ ev_window_check_document_modified (EvWindow *ev_window) return FALSE; } - text = g_markup_printf_escaped (_("Save a copy of document “%s” before closing?"), gtk_window_get_title (GTK_WINDOW (ev_window))); @@ -4427,7 +4423,6 @@ ev_window_inhibit_screensaver (EvWindow *window) _("Running in presentation mode")); } - static void ev_window_uninhibit_screensaver (EvWindow *window) { @@ -4740,7 +4735,6 @@ ev_window_set_page_mode (EvWindow *window, ev_window_update_actions (window); } - static void ev_window_cmd_edit_rotate_left (GtkAction *action, EvWindow *ev_window) { @@ -5990,7 +5984,6 @@ zoom_control_changed_cb (EphyZoomAction *action, * the new expanded window size. */ - if (ev_window->priv->chrome & EV_CHROME_SIDEBAR) { GtkAllocation alloc; @@ -6504,7 +6497,6 @@ static const GtkActionEntry entries[] = { { "EditSaveSettings", NULL, N_("Save Current Settings as _Default"), "<control>T", NULL, G_CALLBACK (ev_window_cmd_edit_save_settings) }, - /* View menu */ { "ViewZoomIn", "zoom-in", N_("Zoom _In"), "<control>plus", N_("Enlarge the document"), @@ -7759,7 +7751,6 @@ ev_window_emit_doc_loaded (EvWindow *window) ev_atril_window_emit_document_loaded (window->priv->skeleton, window->priv->uri); } - #ifdef ENABLE_SYNCTEX static gboolean handle_sync_view_cb (EvAtrilWindow *object, diff --git a/shell/ev-window.h b/shell/ev-window.h index 32d303aa..8e4dd9cf 100644 --- a/shell/ev-window.h +++ b/shell/ev-window.h @@ -58,7 +58,6 @@ typedef struct _EvWindowPrivate EvWindowPrivate; #define EV_IS_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), EV_TYPE_WINDOW)) #define EV_WINDOW_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), EV_TYPE_WINDOW, EvWindowClass)) - struct _EvWindow { GtkApplicationWindow base_instance; EvWindowPrivate *priv; @@ -87,7 +86,6 @@ void ev_window_print_range (EvWindow *ev_window, int last_page); const gchar * ev_window_get_dbus_object_path (EvWindow *ev_window); - G_END_DECLS #endif /* !EV_WINDOW_H */ diff --git a/shell/main.c b/shell/main.c index 79b92524..57950622 100644 --- a/shell/main.c +++ b/shell/main.c @@ -36,7 +36,6 @@ #include "eggsmclient.h" #include "eggdesktopfile.h" - static gchar *ev_page_label; static gchar *ev_find_string; static gint ev_page_index = 0; @@ -48,7 +47,6 @@ static gboolean unlink_temp_file = FALSE; static gchar *print_settings; static const char **file_arguments = NULL; - static gboolean option_version_cb (const gchar *option_name, const gchar *value, @@ -206,8 +204,6 @@ load_files (const char **files) continue; } - - ev_application_open_uri_at_dest (EV_APP, uri, screen, dest, mode, ev_find_string, GDK_CURRENT_TIME); |