change: error message

Author: kjdev

zstd.c

@@ -225,7 +225,7 @@ ZEND_FUNCTION(zstd_uncompress)
 
         if (ZSTD_IS_ERROR(result)) {
             zend_string_efree(output);
-            ZSTD_WARNING("can not decompress stream");
+            ZSTD_WARNING("%s", ZSTD_getErrorName(result));
             RETURN_FALSE;
         }
 
@@ -237,15 +237,15 @@ ZEND_FUNCTION(zstd_uncompress)
         stream = ZSTD_createDStream();
         if (stream == NULL) {
             zend_string_efree(output);
-            ZSTD_WARNING("can not create stream");
+            ZSTD_WARNING("failed to create decompress context");
             RETURN_FALSE;
         }
 
         result = ZSTD_initDStream(stream);
         if (ZSTD_IS_ERROR(result)) {
             zend_string_efree(output);
             ZSTD_freeDStream(stream);
-            ZSTD_WARNING("can not init stream");
+            ZSTD_WARNING("%s", ZSTD_getErrorName(result));
             RETURN_FALSE;
         }
 
@@ -268,7 +268,7 @@ ZEND_FUNCTION(zstd_uncompress)
             if (ZSTD_IS_ERROR(result)) {
                 zend_string_efree(output);
                 ZSTD_freeDStream(stream);
-                ZSTD_WARNING("can not decompress stream");
+                ZSTD_WARNING("%s", ZSTD_getErrorName(result));
                 RETURN_FALSE;
             }
 
@@ -308,14 +308,14 @@ ZEND_FUNCTION(zstd_compress_dict)
 
     cctx = ZSTD_createCCtx();
     if (cctx == NULL) {
-        ZSTD_WARNING("ZSTD_createCCtx() error");
+        ZSTD_WARNING("failed to create compress context");
         RETURN_FALSE;
     }
 
     cdict = ZSTD_createCDict(dict, dict_len, (int) level);
     if (!cdict) {
         ZSTD_freeCStream(cctx);
-        ZSTD_WARNING("ZSTD_createCDict() error");
+        ZSTD_WARNING("failed to load dictionary");
         RETURN_FALSE;
     }
 
@@ -366,7 +366,7 @@ ZEND_FUNCTION(zstd_uncompress_dict)
 
     ddict = ZSTD_createDDict(dict, dict_len);
     if (!ddict) {
-        ZSTD_WARNING("ZSTD_createDDict() error");
+        ZSTD_WARNING("failed to load dictionary");
         RETURN_FALSE;
     }
 
@@ -376,7 +376,7 @@ ZEND_FUNCTION(zstd_uncompress_dict)
     if (dctx == NULL) {
         zend_string_efree(output);
         ZSTD_freeDDict(ddict);
-        ZSTD_WARNING("ZSTD_createDCtx() error");
+        ZSTD_WARNING("failed to create decompress context");
         RETURN_FALSE;
     }
 
@@ -496,8 +496,7 @@ static int php_zstd_comp_flush_or_end(php_zstd_stream_data *self, int end)
         res = ZSTD_compressStream2(self->cctx, &self->output, &in,
                                    end ? ZSTD_e_end : ZSTD_e_flush);
         if (ZSTD_isError(res)) {
-            php_error_docref(NULL, E_WARNING,
-                             "libzstd error %s\n", ZSTD_getErrorName(res));
+            ZSTD_WARNING("zstd: %s\n", ZSTD_getErrorName(res));
             ret = EOF;
         }
         php_stream_write(self->stream, self->output.dst, self->output.pos);
@@ -578,8 +577,7 @@ static ssize_t php_zstd_decomp_read(php_stream *stream, char *buf, size_t count)
             res = ZSTD_decompressStream(self->dctx,
                                         &self->output, &self->input);
             if (ZSTD_IS_ERROR(res)) {
-                php_error_docref(NULL, E_WARNING,
-                                 "libzstd error %s\n", ZSTD_getErrorName(res));
+                ZSTD_WARNING("zstd: %s\n", ZSTD_getErrorName(res));
 #if PHP_VERSION_ID >= 70400
                 return -1;
 #endif
@@ -619,8 +617,7 @@ php_zstd_comp_write(php_stream *stream, const char *buf, size_t count)
         res = ZSTD_compressStream2(self->cctx, &self->output,
                                    &in, ZSTD_e_continue);
         if (ZSTD_isError(res)) {
-            php_error_docref(NULL, E_WARNING,
-                             "libzstd error %s\n", ZSTD_getErrorName(res));
+            ZSTD_WARNING("zstd: %s\n", ZSTD_getErrorName(res));
 #if PHP_VERSION_ID >= 70400
             return -1;
 #endif
@@ -717,9 +714,8 @@ php_stream_zstd_opener(
     }
 
     if (level > ZSTD_maxCLevel()) {
-        php_error_docref(NULL, E_WARNING,
-                         "zstd: compression level (%d) must be less than %d",
-                         level, ZSTD_maxCLevel());
+        ZSTD_WARNING("zstd: compression level (%d) must be less than %d",
+                     level, ZSTD_maxCLevel());
         level = ZSTD_maxCLevel();
     }
 
@@ -736,8 +732,7 @@ php_stream_zstd_opener(
         self->dctx = NULL;
         self->cctx = ZSTD_createCCtx();
         if (!self->cctx) {
-            php_error_docref(NULL, E_WARNING,
-                             "zstd: compression context failed");
+            ZSTD_WARNING("zstd: compression context failed");
             php_stream_close(self->stream);
             efree(self);
             return NULL;
@@ -755,8 +750,7 @@ php_stream_zstd_opener(
     } else {
         self->dctx = ZSTD_createDCtx();
         if (!self->dctx) {
-            php_error_docref(NULL, E_WARNING,
-                             "zstd: compression context failed");
+            ZSTD_WARNING("zstd: compression context failed");
             php_stream_close(self->stream);
             efree(self);
             return NULL;
@@ -941,7 +935,7 @@ php_zstd_output_handler_load_dict(php_zstd_context *ctx, int level)
                                         REPORT_ERRORS, // | USE_PATH
                                         NULL, context);
     if (!stream) {
-        ZSTD_WARNING("could not open dictionary stream: %s", dict);
+        ZSTD_WARNING("failed to open dictionary stream: %s", dict);
         return;
     }