Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 103386 | Differences between
and this patch

Collapse All | Expand All

(-)scrollkeeper-0.3.14/buildtools/separate.c (-1 / +8 lines)
Lines 25-33 Link Here
25
#include <unistd.h>
25
#include <unistd.h>
26
#include <sys/stat.h>
26
#include <sys/stat.h>
27
#include <errno.h>
27
#include <errno.h>
28
#include <libintl.h>
29
#include <scrollkeeper.h>
28
#include <scrollkeeper.h>
30
29
30
#ifdef ENABLE_NLS
31
#include <libintl.h>
32
#else
33
#define _(x) x
34
#endif
35
31
typedef struct {
36
typedef struct {
32
	char *filename;
37
	char *filename;
33
	char *locale;
38
	char *locale;
Lines 306-314 main (int argc, char *argv[]) Link Here
306
	int locale_num, i;
311
	int locale_num, i;
307
	int locale_tree_error=0;
312
	int locale_tree_error=0;
308
313
314
#ifdef ENABLE_NLS
309
    	setlocale (LC_ALL, "");
315
    	setlocale (LC_ALL, "");
310
    	bindtextdomain (PACKAGE, SCROLLKEEPERLOCALEDIR);
316
    	bindtextdomain (PACKAGE, SCROLLKEEPERLOCALEDIR);
311
    	textdomain (PACKAGE);
317
    	textdomain (PACKAGE);
318
#endif
312
    
319
    
313
    	if (argc != 3) {
320
    	if (argc != 3) {
314
    		usage();
321
    		usage();
(-)scrollkeeper-0.3.14/libs/database.c (-1 / +6 lines)
Lines 23-34 Link Here
23
#include <unistd.h>
23
#include <unistd.h>
24
#include <sys/stat.h>
24
#include <sys/stat.h>
25
#include <errno.h>
25
#include <errno.h>
26
#include <libintl.h>
27
#include <dirent.h>
26
#include <dirent.h>
28
#include <scrollkeeper.h>
27
#include <scrollkeeper.h>
29
28
30
#define PATHLEN		256
29
#define PATHLEN		256
31
30
31
#ifdef ENABLE_NLS
32
#include <libintl.h>
33
#define _(String) gettext (String)
34
#else
35
#define _(String) String
36
#endif
32
37
33
/*
38
/*
34
 * Create a directory.  Send errors to appropriate places (STDOUT and log 
39
 * Create a directory.  Send errors to appropriate places (STDOUT and log 
(-)scrollkeeper-0.3.14/libs/error.c (-1 / +7 lines)
Lines 22-32 Link Here
22
#include <scrollkeeper.h>
22
#include <scrollkeeper.h>
23
#include <errno.h>
23
#include <errno.h>
24
#include <string.h>
24
#include <string.h>
25
#include <libintl.h>
26
#include <stdlib.h>
25
#include <stdlib.h>
27
#include <sys/stat.h>
26
#include <sys/stat.h>
28
#include <time.h>
27
#include <time.h>
29
28
29
#ifdef ENABLE_NLS
30
#include <libintl.h>
31
#define _(String) gettext (String)
32
#else
33
#define _(String) String
34
#endif
35
30
/*
36
/*
31
 * sk_warning:
37
 * sk_warning:
32
 *               This is a general purpose function for sending error and 
38
 *               This is a general purpose function for sending error and 
(-)scrollkeeper-0.3.14/libs/extract.c (-1 / +7 lines)
Lines 18-24 Link Here
18
18
19
#include <config.h>
19
#include <config.h>
20
#include <locale.h>
20
#include <locale.h>
21
#include <libintl.h>
22
#include <libxslt/xslt.h>
21
#include <libxslt/xslt.h>
23
#include <libxslt/xsltInternals.h>
22
#include <libxslt/xsltInternals.h>
24
#include <libxslt/transform.h>
23
#include <libxslt/transform.h>
Lines 33-38 Link Here
33
#include <errno.h>
32
#include <errno.h>
34
#include <sys/stat.h>
33
#include <sys/stat.h>
35
34
35
#ifdef ENABLE_NLS
36
#include <libintl.h>
37
#define _(String) gettext (String)
38
#else
39
#define _(String) String
40
#endif
41
36
extern int xmlLoadExtDtdDefaultValue;
42
extern int xmlLoadExtDtdDefaultValue;
37
43
38
int apply_stylesheets (char *input_file, char *type, int stylesheet_num,
44
int apply_stylesheets (char *input_file, char *type, int stylesheet_num,
(-)scrollkeeper-0.3.14/libs/install.c (-1 / +5 lines)
Lines 25-35 Link Here
25
#include <unistd.h>
25
#include <unistd.h>
26
#include <sys/stat.h>
26
#include <sys/stat.h>
27
#include <errno.h>
27
#include <errno.h>
28
#include <libintl.h>
29
#include <dirent.h>
28
#include <dirent.h>
30
#include <scrollkeeper.h>
29
#include <scrollkeeper.h>
31
30
31
#ifdef ENABLE_NLS
32
#include <libintl.h>
32
#define _(String) gettext (String)
33
#define _(String) gettext (String)
34
#else
35
#define _(String) String
36
#endif
33
37
34
#define SEP		"|"
38
#define SEP		"|"
35
#define PATHLEN		256
39
#define PATHLEN		256
(-)scrollkeeper-0.3.14/libs/uninstall.c (-1 / +5 lines)
Lines 23-33 Link Here
23
#include <string.h>
23
#include <string.h>
24
#include <unistd.h>
24
#include <unistd.h>
25
#include <sys/stat.h>
25
#include <sys/stat.h>
26
#include <libintl.h>
27
#include <locale.h>
26
#include <locale.h>
28
#include <scrollkeeper.h>
27
#include <scrollkeeper.h>
29
28
29
#ifdef ENABLE_NLS
30
#include <libintl.h>
30
#define _(String) gettext (String)
31
#define _(String) gettext (String)
32
#else
33
#define _(String) String
34
#endif
31
35
32
#define PATHLEN		256
36
#define PATHLEN		256
33
37
(-)scrollkeeper-0.3.14/libs/update-url.c (-1 / +5 lines)
Lines 23-32 Link Here
23
#include <string.h>
23
#include <string.h>
24
#include <unistd.h>
24
#include <unistd.h>
25
#include <sys/stat.h>
25
#include <sys/stat.h>
26
#include <libintl.h>
27
#include <scrollkeeper.h>
26
#include <scrollkeeper.h>
28
27
28
#ifdef ENABLE_NLS
29
#include <libintl.h>
29
#define _(String) gettext (String)
30
#define _(String) gettext (String)
31
#else
32
#define _(String) String
33
#endif
30
34
31
int update_doc_url_in_omf_file(char *omf_name, char *url, char *omf_new_name)
35
int update_doc_url_in_omf_file(char *omf_name, char *url, char *omf_new_name)
32
{
36
{
(-)scrollkeeper-0.3.14/cl/src/preinstall.c (-1 / +8 lines)
Lines 23-32 Link Here
23
#include <string.h>
23
#include <string.h>
24
#include <unistd.h>
24
#include <unistd.h>
25
#include <sys/stat.h>
25
#include <sys/stat.h>
26
#include <libintl.h>
27
#include <locale.h>
26
#include <locale.h>
28
#include <scrollkeeper.h>
27
#include <scrollkeeper.h>
29
28
29
#ifdef ENABLE_NLS
30
#include <libintl.h>
31
#else
32
#define _(x) x
33
#endif
34
30
static xmlExternalEntityLoader defaultEntityLoader = NULL;
35
static xmlExternalEntityLoader defaultEntityLoader = NULL;
31
36
32
static void usage()
37
static void usage()
Lines 41-49 main (int argc, char *argv[]) Link Here
41
    char *omf_name, *url, *omf_new_name;
46
    char *omf_name, *url, *omf_new_name;
42
    int i;
47
    int i;
43
    
48
    
49
#ifdef ENABLE_NLS
44
    setlocale (LC_ALL, "");
50
    setlocale (LC_ALL, "");
45
    bindtextdomain (PACKAGE, SCROLLKEEPERLOCALEDIR);
51
    bindtextdomain (PACKAGE, SCROLLKEEPERLOCALEDIR);
46
    textdomain (PACKAGE);
52
    textdomain (PACKAGE);
53
#endif
47
    
54
    
48
	
55
	
49
    if (argc < 3) {
56
    if (argc < 3) {
(-)scrollkeeper-0.3.14/cl/src/get-cl.c (-1 / +8 lines)
Lines 25-31 Link Here
25
#include <stdlib.h>
25
#include <stdlib.h>
26
#include <stdio.h>
26
#include <stdio.h>
27
#include <string.h>
27
#include <string.h>
28
#include <libintl.h>
29
#include <libxml/tree.h>
28
#include <libxml/tree.h>
30
#include <scrollkeeper.h>
29
#include <scrollkeeper.h>
31
#include <errno.h>
30
#include <errno.h>
Lines 37-42 Link Here
37
#include <utime.h>
36
#include <utime.h>
38
#include <pwd.h>
37
#include <pwd.h>
39
38
39
#ifdef ENABLE_NLS
40
#include <libintl.h>
41
#else
42
#define _(x) x
43
#endif
44
40
/*
45
/*
41
 * make_local_tmpdir:
46
 * make_local_tmpdir:
42
 * @dirname: directory name.
47
 * @dirname: directory name.
Lines 198-206 int main(int argc, char **argv) Link Here
198
	xmlDocPtr merged_tree;
203
	xmlDocPtr merged_tree;
199
        char outputprefs=0;
204
        char outputprefs=0;
200
205
206
#ifdef ENABLE_NLS
201
    	setlocale (LC_ALL, "");
207
    	setlocale (LC_ALL, "");
202
    	bindtextdomain (PACKAGE, SCROLLKEEPERLOCALEDIR);
208
    	bindtextdomain (PACKAGE, SCROLLKEEPERLOCALEDIR);
203
    	textdomain (PACKAGE);
209
    	textdomain (PACKAGE);
210
#endif
204
211
205
    	usage(argc, argv);
212
    	usage(argc, argv);
206
213
(-)scrollkeeper-0.3.14/cl/src/scrollkeeper-install.c (-1 / +8 lines)
Lines 25-34 Link Here
25
#include <unistd.h>
25
#include <unistd.h>
26
#include <sys/stat.h>
26
#include <sys/stat.h>
27
#include <errno.h>
27
#include <errno.h>
28
#include <libintl.h>
29
#include <dirent.h>
28
#include <dirent.h>
30
#include <scrollkeeper.h>
29
#include <scrollkeeper.h>
31
30
31
#ifdef ENABLE_NLS
32
#include <libintl.h>
33
#else
34
#define _(x) x
35
#endif
36
32
static xmlExternalEntityLoader defaultEntityLoader = NULL;
37
static xmlExternalEntityLoader defaultEntityLoader = NULL;
33
38
34
static void usage()
39
static void usage()
Lines 47-55 main (int argc, char *argv[]) Link Here
47
    char outputprefs=0;
52
    char outputprefs=0;
48
    int i;
53
    int i;
49
    
54
    
55
#ifdef ENABLE_NLS
50
    setlocale (LC_ALL, "");
56
    setlocale (LC_ALL, "");
51
    bindtextdomain (PACKAGE, SCROLLKEEPERLOCALEDIR);
57
    bindtextdomain (PACKAGE, SCROLLKEEPERLOCALEDIR);
52
    textdomain (PACKAGE);
58
    textdomain (PACKAGE);
59
#endif
53
60
54
    if (argc == 1) {
61
    if (argc == 1) {
55
	usage();
62
	usage();
(-)scrollkeeper-0.3.14/cl/src/scrollkeeper-uninstall.c (-1 / +8 lines)
Lines 23-32 Link Here
23
#include <string.h>
23
#include <string.h>
24
#include <unistd.h>
24
#include <unistd.h>
25
#include <sys/stat.h>
25
#include <sys/stat.h>
26
#include <libintl.h>
27
#include <locale.h>
26
#include <locale.h>
28
#include <scrollkeeper.h>
27
#include <scrollkeeper.h>
29
28
29
#ifdef ENABLE_NLS
30
#include <libintl.h>
31
#else
32
#define _(x) x
33
#endif
34
30
static void usage()
35
static void usage()
31
{
36
{
32
    printf(_("Usage: scrollkeeper-uninstall [-v] [-q] [-p <SCROLLKEEPER_DB_DIR>] <OMF FILE>\n"));
37
    printf(_("Usage: scrollkeeper-uninstall [-v] [-q] [-p <SCROLLKEEPER_DB_DIR>] <OMF FILE>\n"));
Lines 41-49 main (int argc, char *argv[]) Link Here
41
    char outputprefs=0;
46
    char outputprefs=0;
42
    int i;
47
    int i;
43
 
48
 
49
#ifdef ENABLE_NLS
44
    setlocale (LC_ALL, "");
50
    setlocale (LC_ALL, "");
45
    bindtextdomain (PACKAGE, SCROLLKEEPERLOCALEDIR);
51
    bindtextdomain (PACKAGE, SCROLLKEEPERLOCALEDIR);
46
    textdomain (PACKAGE);
52
    textdomain (PACKAGE);
53
#endif
47
    
54
    
48
    if (argc == 1)
55
    if (argc == 1)
49
	usage();
56
	usage();
(-)scrollkeeper-0.3.14/cl/src/update.c (-1 / +8 lines)
Lines 24-35 Link Here
24
#include <stdlib.h>
24
#include <stdlib.h>
25
#include <string.h>
25
#include <string.h>
26
#include <errno.h>
26
#include <errno.h>
27
#include <libintl.h>
28
#include <locale.h>
27
#include <locale.h>
29
#include <dirent.h>
28
#include <dirent.h>
30
#include <unistd.h>
29
#include <unistd.h>
31
#include <scrollkeeper.h>
30
#include <scrollkeeper.h>
32
31
32
#ifdef ENABLE_NLS
33
#include <libintl.h>
34
#else
35
#define _(x) x
36
#endif
37
33
static char **av;
38
static char **av;
34
static char config_omf_dir[PATHLEN];
39
static char config_omf_dir[PATHLEN];
35
static xmlExternalEntityLoader defaultEntityLoader = NULL;
40
static xmlExternalEntityLoader defaultEntityLoader = NULL;
Lines 361-369 int main(int argc, char **argv) Link Here
361
366
362
    av = argv;
367
    av = argv;
363
    
368
    
369
#ifdef ENABLE_NLS
364
    setlocale (LC_ALL, "");
370
    setlocale (LC_ALL, "");
365
    bindtextdomain (PACKAGE, SCROLLKEEPERLOCALEDIR);
371
    bindtextdomain (PACKAGE, SCROLLKEEPERLOCALEDIR);
366
    textdomain (PACKAGE);
372
    textdomain (PACKAGE);
373
#endif
367
374
368
    scrollkeeper_dir[0] = '\0';
375
    scrollkeeper_dir[0] = '\0';
369
    omf_dir[0] = '\0';
376
    omf_dir[0] = '\0';
(-)scrollkeeper-0.3.14/extract/src/scrollkeeper-extract.c (-1 / +8 lines)
Lines 18-30 Link Here
18
18
19
#include <config.h>
19
#include <config.h>
20
#include <locale.h>
20
#include <locale.h>
21
#include <libintl.h>
22
#include <scrollkeeper.h>
21
#include <scrollkeeper.h>
23
#include <stdlib.h>
22
#include <stdlib.h>
24
#include <string.h>
23
#include <string.h>
25
#include <sys/stat.h>
24
#include <sys/stat.h>
26
#include <errno.h>
25
#include <errno.h>
27
26
27
#ifdef ENABLE_NLS
28
#include <libintl.h>
29
#else
30
#define _(x) x
31
#endif
32
28
static void usage()
33
static void usage()
29
{
34
{
30
	printf(_("Usage: scrollkeeper-extract <xml file> <stylesheet 1> <output file 1> <stylesheet 2> <output file 2> ...\n"));
35
	printf(_("Usage: scrollkeeper-extract <xml file> <stylesheet 1> <output file 1> <stylesheet 2> <output file 2> ...\n"));
Lines 38-46 main (int argc, char *argv[]) Link Here
38
	char *extension;
43
	char *extension;
39
        char outputprefs=0;
44
        char outputprefs=0;
40
45
46
#ifdef ENABLE_NLS
41
	setlocale (LC_ALL, "");
47
	setlocale (LC_ALL, "");
42
  	bindtextdomain (PACKAGE, SCROLLKEEPERLOCALEDIR);
48
  	bindtextdomain (PACKAGE, SCROLLKEEPERLOCALEDIR);
43
  	textdomain (PACKAGE);
49
  	textdomain (PACKAGE);
50
#endif
44
51
45
	num = (argc-2)/2;
52
	num = (argc-2)/2;
46
53
(-)scrollkeeper-0.3.14/scripts/gen-docuid.c (-1 / +8 lines)
Lines 17-29 Link Here
17
 */
17
 */
18
18
19
#include <config.h>
19
#include <config.h>
20
#include <libintl.h>
21
#include <locale.h>
20
#include <locale.h>
22
#include <stdio.h>
21
#include <stdio.h>
23
#include <string.h>
22
#include <string.h>
24
#include <uuid.h>
23
#include <uuid.h>
25
#include <scrollkeeper.h>
24
#include <scrollkeeper.h>
26
25
26
#ifdef ENABLE_NLS
27
#include <libintl.h>
28
#else
29
#define _(x) x
30
#endif
31
27
int
32
int
28
main (int argc, char *argv[])
33
main (int argc, char *argv[])
29
{
34
{
Lines 32-40 main (int argc, char *argv[]) Link Here
32
37
33
	if (argc > 1)
38
	if (argc > 1)
34
	{
39
	{
40
#ifdef ENABLE_NLS
35
	     setlocale (LC_ALL, "");
41
	     setlocale (LC_ALL, "");
36
	     bindtextdomain (PACKAGE, SCROLLKEEPERLOCALEDIR);
42
	     bindtextdomain (PACKAGE, SCROLLKEEPERLOCALEDIR);
37
	     textdomain (PACKAGE);
43
	     textdomain (PACKAGE);
44
#endif
38
45
39
	     if (strcmp (argv[1], "--help") == 0)
46
	     if (strcmp (argv[1], "--help") == 0)
40
	     {
47
	     {

Return to bug 103386