Changeset 950:51c15f98a965 in freeDiameter for libfdcore/fdd.y

Timestamp:

Feb 21, 2013, 7:57:32 PM (11 years ago)

Author:

Thomas Klausner <tk@giga.or.at>

Branch:

default

Parents:

949:ad5c976e0dc7 (diff), 924:877592751fee (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Phase:

public

Message:

merge current version from 1.1 branch (927:877592751fee).

File:

• libfdcore/fdd.y (modified) (7 diffs)

libfdcore/fdd.y

@@ -328 +328 @@
                                 if (fd == NULL) {
                                         int ret = errno;
-                                        TRACE_DEBUG(INFO, "Unable to open extension file %s for reading: %s\n", fname, strerror(ret));
+                                        TRACE_DEBUG_ERROR("Unable to open extension file %s for reading: %s\n", fname, strerror(ret));
                                         yyerror (&yylloc, conf, "Error adding extension"); 
                                         YYERROR;
@@ -502 +502 @@
                                 if (fd == NULL) {
                                         int ret = errno;
-                                        TRACE_DEBUG(INFO, "Unable to open certificate file %s for reading: %s\n", $3, strerror(ret));
+                                        TRACE_DEBUG_ERROR("Unable to open certificate file %s for reading: %s\n", $3, strerror(ret));
                                         yyerror (&yylloc, conf, "Error on file name"); 
                                         YYERROR;
@@ -510 +510 @@
                                 if (fd == NULL) {
                                         int ret = errno;
-                                        TRACE_DEBUG(INFO, "Unable to open private key file %s for reading: %s\n", $5, strerror(ret));
+                                        TRACE_DEBUG_ERROR("Unable to open private key file %s for reading: %s\n", $5, strerror(ret));
                                         yyerror (&yylloc, conf, "Error on file name"); 
                                         YYERROR;
@@ -533 +533 @@
                                 if (fd == NULL) {
                                         int ret = errno;
-                                        TRACE_DEBUG(INFO, "Unable to open CA file %s for reading: %s\n", $3, strerror(ret));
+                                        TRACE_DEBUG_ERROR("Unable to open CA file %s for reading: %s\n", $3, strerror(ret));
                                         yyerror (&yylloc, conf, "Error on file name"); 
                                         YYERROR;
@@ -573 +573 @@
                                 if (fd == NULL) {
                                         int ret = errno;
-                                        TRACE_DEBUG(INFO, "Unable to open CRL file %s for reading: %s\n", $3, strerror(ret));
+                                        TRACE_DEBUG_ERROR("Unable to open CRL file %s for reading: %s\n", $3, strerror(ret));
                                         yyerror (&yylloc, conf, "Error on file name"); 
                                         YYERROR;
@@ -616 +616 @@
                                                         &err_pos),
                                                 { yyerror (&yylloc, conf, "Error setting Priority parameter.");
-                                                  fprintf(stderr, "Error at position : %s\n", err_pos);
+                                                  TRACE_DEBUG_ERROR("Error at position : %s\n", err_pos);
                                                   YYERROR; } );
                         }
@@ -633 +633 @@
                                 if (fd == NULL) {
                                         int ret = errno;
-                                        TRACE_DEBUG(INFO, "Unable to open DH file %s for reading: %s\n", $3, strerror(ret));
+                                        TRACE_DEBUG_ERROR("Unable to open DH file %s for reading: %s\n", $3, strerror(ret));
                                         yyerror (&yylloc, conf, "Error on file name"); 
                                         YYERROR;