FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 09:16:53 +00:00
Code Issues Releases Wiki Activity

50_TelegramBot: rewrite readfile function $_ warning - #msg651947

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@14613 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
viegener 2017-07-01 10:18:33 +00:00
parent a84944ea0e
commit 43d2037406
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it. # Do not insert empty lines here, update check depends on it.
- bugfix: 50_TelegramBot: rewrite readfile function $_ warning - #msg651947
- bugfix: 49_SSCAM: V2.2.3, fix if SVSversion small is "0" - bugfix: 49_SSCAM: V2.2.3, fix if SVSversion small is "0"
- new: 00_SmartMeterP1: V1.7 New module for reading elec.+gas smartmeters. - new: 00_SmartMeterP1: V1.7 New module for reading elec.+gas smartmeters.
- feature: 93_DbRep: V5.3.1, new commands optimizeTables (MySQL) and vacuum - feature: 93_DbRep: V5.3.1, new commands optimizeTables (MySQL) and vacuum

8
fhem/FHEM/50_TelegramBot.pm
View File

@ -116,7 +116,8 @@
# FIX: non-local $_ - see #msg647071 # FIX: non-local $_ - see #msg647071
# 2.4.1 2017-06-16 minor fixes - #msg641797 / #msg647071 # 2.4.1 2017-06-16 minor fixes - #msg641797 / #msg647071
# # FIX: make fileread work for both old and new perl versions
# 2.4.2 2017-07-01 rewrite read file function due to $_ warning - #msg651947
# #
# #
############################################################################## ##############################################################################
@ -3240,7 +3241,6 @@ sub TelegramBot_MsgForLog($;$) {
# #
sub TelegramBot_BinaryFileRead($$) { sub TelegramBot_BinaryFileRead($$) {
my ($hash, $fileName) = @_; my ($hash, $fileName) = @_;
my $_;
return '' if ( ! (-e $fileName) ); return '' if ( ! (-e $fileName) );
@ -3248,8 +3248,8 @@ sub TelegramBot_BinaryFileRead($$) {
open TGB_BINFILE, '<'.$fileName; open TGB_BINFILE, '<'.$fileName;
binmode TGB_BINFILE; binmode TGB_BINFILE;
while (<TGB_BINFILE>){ while (my $line = <TGB_BINFILE>){
$fileData .= $_; $fileData .= $line;
} }
close TGB_BINFILE; close TGB_BINFILE;