From e39d1458a1e8c8ebc5511e6d6929c939c903a6a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 10 Sep 2022 15:30:46 +0000 Subject: [PATCH] Fix lost changes during rebase --- Firmware/util.cpp | 5 ++--- Firmware/util.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Firmware/util.cpp b/Firmware/util.cpp index 2576967eb..992204f84 100644 --- a/Firmware/util.cpp +++ b/Firmware/util.cpp @@ -420,7 +420,7 @@ void gcode_level_check(uint16_t nGcodeLevel) { #define GCODE_DELIMITER '"' #define ELLIPSIS "..." -char *code_string(char *pStr, size_t *nLength) { +char *code_string(const char *pStr, size_t *nLength) { char* pStrBegin; char* pStrEnd; @@ -432,11 +432,10 @@ pStrEnd=strchr(pStrBegin,GCODE_DELIMITER); if(!pStrEnd) return(NULL); *nLength=pStrEnd-pStrBegin; -pStrBegin[*nLength] = '\0'; return pStrBegin; } -void printer_smodel_check(char *pStrPos) { +void printer_smodel_check(const char *pStrPos) { char* pResult; size_t nLength,nPrinterNameLength; diff --git a/Firmware/util.h b/Firmware/util.h index 9b33cc2e4..f2ad46c4b 100644 --- a/Firmware/util.h +++ b/Firmware/util.h @@ -104,7 +104,7 @@ extern ClCheckGcode oCheckGcode; void fCheckModeInit(); void nozzle_diameter_check(uint16_t nDiameter); void printer_model_check(uint16_t nPrinterModel); -void printer_smodel_check(char* pStrPos); +void printer_smodel_check(const char* pStrPos); void fw_version_check(const char *pVersion); void gcode_level_check(uint16_t nGcodeLevel);