No commit message

axfor · Apr 23, 2008 · e33c972 · e33c972
1 parent 94393e5
commit e33c972
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 5 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -6,6 +6,9 @@
 	* qrenc.c, tests/view_qrcode.c:
 	  - Return value checks have been added.
 	  - Structured-append encode with version 0 now returns error.
+	* qrencode.[ch]:
+	  - QRencode_encodeStructuredInput() -> QRencode_encodeInputStructured()
+	    (for consistency with other QRencode_encode*Structured() functions)
 
 2008.04.20 Kentaro FUKUCHI <fukuchi@megaui.net>
 	* qrencode.h:

diff --git a/NEWS b/NEWS
@@ -8,6 +8,8 @@ Summary:
 * Structured append support has been added. (patches from Yusuke Mihara)
 * The "-S" option for structured append has been added to qrencode and
   view_qrcode.
+* Some functions now set errno to indicate errors.
+* Some bug fixes.
 
 Release Note:
 

diff --git a/qrencode.c b/qrencode.c
@@ -538,7 +538,7 @@ static unsigned char QRcode_parity(const char *str, int size)
 }
 #endif
 
-QRcode_List *QRcode_encodeStructuredInput(QRinput_Struct *s)
+QRcode_List *QRcode_encodeInputStructured(QRinput_Struct *s)
 {
 	QRcode_List *head = NULL;
 	QRcode_List *tail = NULL;
@@ -571,7 +571,7 @@ static QRcode_List *QRcode_encodeInputToStructured(QRinput *input)
 	s = QRinput_splitQRinputToStruct(input);
 	if(s == NULL) return NULL;
 
-	codes = QRcode_encodeStructuredInput(s);
+	codes = QRcode_encodeInputStructured(s);
 	QRinput_Struct_free(s);
 
 	return codes;

diff --git a/qrencode.h b/qrencode.h
@@ -378,7 +378,7 @@ extern void QRcode_free(QRcode *qrcode);
  * @param s
  * @return a singly-linked list of QRcode.
  */
-extern QRcode_List *QRcode_encodeStructuredInput(QRinput_Struct *s);
+extern QRcode_List *QRcode_encodeInputStructured(QRinput_Struct *s);
 
 /**
  * Create structured symbols from the string. The library automatically parses

diff --git a/tests/test_monkey.c b/tests/test_monkey.c
@@ -224,7 +224,7 @@ void test_split_structure(void)
 		i++;
 		il = il->next;
 	}
-	codes = QRcode_encodeStructuredInput(s);
+	codes = QRcode_encodeInputStructured(s);
 	list = codes;
 	il = s->head;
 	c = 0;

diff --git a/tests/view_qrcode.c b/tests/view_qrcode.c
@@ -146,7 +146,7 @@ void draw_structuredQRcode(QRinput_Struct *s, int mask)
 	int swidth;
 	QRcode_List *qrcodes, *p;
 
-	qrcodes = QRcode_encodeStructuredInput(s);
+	qrcodes = QRcode_encodeInputStructured(s);
 	if(qrcodes == NULL) return;
 
 	swidth = (qrcodes->code->width + margin * 2) * size;