Peter M. Groen / FlashMQ

Commit c986edcf79a0f680c4de6335f9cf513252d903e9

Authored by Wiebe Cazemier
1 parent 684f5eb8

Use writeString() in db files

Inline Side-by-side
Showing 1 changed file with 4 additions and 9 deletions
sessionsandsubscriptionsdb.cpp
  View file @c986edc
... ... @@ -266,11 +266,8 @@ void SessionsAndSubscriptionsDB::saveData(const std::vector<std::unique_ptr<Sess
266 266  
267 267 writeCheck(reserved, 1, RESERVED_SPACE_SESSIONS_DB_V2, f);
268 268  
269   - writeUint32(ses->username.length());
270   - writeCheck(ses->username.c_str(), 1, ses->username.length(), f);
271   -
272   - writeUint32(ses->client_id.length());
273   - writeCheck(ses->client_id.c_str(), 1, ses->client_id.length(), f);
  269 + writeString(ses->username);
  270 + writeString(ses->client_id);
274 271  
275 272 const size_t qosPacketsExpected = ses->qosPacketQueue.size();
276 273 size_t qosPacketsCounted = 0;
... ... @@ -362,8 +359,7 @@ void SessionsAndSubscriptionsDB::saveData(const std::vector<std::unique_ptr<Sess
362 359  
363 360 logger->logf(LOG_DEBUG, "Writing subscriptions to topic '%s'.", topic.c_str());
364 361  
365   - writeUint32(topic.size());
366   - writeCheck(topic.c_str(), 1, topic.size(), f);
  362 + writeString(topic);
367 363  
368 364 writeUint32(subscriptions.size());
369 365  
... ... @@ -371,8 +367,7 @@ void SessionsAndSubscriptionsDB::saveData(const std::vector<std::unique_ptr<Sess
371 367 {
372 368 logger->logf(LOG_DEBUG, "Saving session '%s' subscription to '%s' QoS %d.", subscription.clientId.c_str(), topic.c_str(), subscription.qos);
373 369  
374   - writeUint32(subscription.clientId.size());
375   - writeCheck(subscription.clientId.c_str(), 1, subscription.clientId.size(), f);
  370 + writeString(subscription.clientId);
376 371 writeCheck(&subscription.qos, 1, 1, f);
377 372 }
378 373 }
... ...