Book a Demo!
CoCalc Logo Icon
StoreFeaturesDocsShareSupportNewsAboutPoliciesSign UpSign In
freebsd
GitHub Repository: freebsd/freebsd-ports-kde
 Path: blob/main/japanese/epwutil/files/patch-catdump.c
16462 views
1
--- catdump.c.orig	2016-05-13 19:10:22 UTC

2
+++ catdump.c

3
@@ -201,7 +201,7 @@ void	outhex();

4
 void	outstr();

5
 void	outjstr();

6
 int	undump();

7
-uchr	*getline();

8
+uchr	*get_line();

9
 uchr	*getvalue();

10
 int	gethex();

11
 int	hexdigit();

12
@@ -561,7 +561,7 @@ char	*txtfile, *catalog;

13
     err = 0;

14
     line = 0;

15
 

16
-    if (getline(buf, fp) == NULL ||

17
+    if (get_line(buf, fp) == NULL ||

18
 	strncmp(buf, CAT_ENTRY, strlen(CAT_ENTRY))) {

19
 	fprintf(stderr, "ERR: ���� %s ������ޤ���\n", CAT_ENTRY);

20
 	fclose(fp);

21
@@ -571,7 +571,7 @@ char	*txtfile, *catalog;

22
     st = 0;

23
     hdr = (HDR_T *)catbuf;

24
     mask = 0L;

25
-    while (getline(buf, fp) != NULL && *buf != '[') {

26
+    while (get_line(buf, fp) != NULL && *buf != '[') {

27
 	if ((p = getvalue(buf)) == NULL) {

28
 	    fprintf(stderr, "ERR: line %d: ��ʸ�˸��꤬����ޤ�\n", line);

29
 	    err++;

30
@@ -666,7 +666,7 @@ char	*txtfile, *catalog;

31
 	if (strncmp(buf, BOOK_ENTRY, strlen(BOOK_ENTRY))) {

32
 	    fprintf(stderr, "ERR: line %d: �����ʹ��ܤǤ�(%s)\n", line, buf);

33
 	    err++;

34
-	    while (getline(buf, fp) != NULL && *buf != '[')

35
+	    while (get_line(buf, fp) != NULL && *buf != '[')

36
 		;

37
 	    if (*buf == '\0')

38
 		break;

39
@@ -680,7 +680,7 @@ char	*txtfile, *catalog;

40
 	    break;

41
 	}

42
 	mask = 0;

43
-	while (getline(buf, fp) != NULL && *buf != '[') {

44
+	while (get_line(buf, fp) != NULL && *buf != '[') {

45
 	    if ((p = getvalue(buf)) == NULL) {

46
 		fprintf(stderr, "ERR: line %d: ��ʸ�˸��꤬����ޤ�\n", line);

47
 		err++;

48
@@ -917,7 +917,7 @@ char	*txtfile, *catalog;

49
 }

50
 

51
 uchr *

52
-getline(buf, fp)

53
+get_line(buf, fp)

54
 uchr	*buf;

55
 FILE	*fp;

56
 {

57


58