The watchdog function became obsoleted; adopt code to new standard

There are not many calls to watchdog() , but this function became obsoleted recently. These calls should be modified to current standards.